diff --git a/debian/patches/makefile-install_el_files_to_correct_dir.patch b/debian/patches/makefile-install_el_files_to_correct_dir.patch
deleted file mode 100644
index 966ab75..0000000
--- a/debian/patches/makefile-install_el_files_to_correct_dir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix elisp install location
-Author: David Caldwell <david@porkrind.org>
-
-Index: commit-patch/Makefile
-===================================================================
---- commit-patch.orig/Makefile	2019-02-13 23:14:06.678581982 -0800
-+++ commit-patch/Makefile	2019-02-13 23:14:06.646581248 -0800
-@@ -42,9 +42,9 @@
- install: $(ALL)
- 	mkdir -p "$(PREFIX)/bin"
- 	mkdir -p "$(PREFIX)/share/man/man1"
--	mkdir -p "$(PREFIX)/share/emacs/site-lisp"
-+	mkdir -p "$(PREFIX)/share/emacs/site-lisp/commit-patch"
- 	mkdir -p "$(PREFIX)/share/doc/commit-patch"
- 	cp -a $(BIN)   "$(PREFIX)/bin"
- 	cp -a $(MAN)   "$(PREFIX)/share/man/man1"
--	cp -a $(ELISP) "$(PREFIX)/share/emacs/site-lisp"
-+	cp -a $(ELISP) "$(PREFIX)/share/emacs/site-lisp/commit-patch"
- 	cp -a $(DOC)   "$(PREFIX)/share/doc/commit-patch"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3643075..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-makefile-install_el_files_to_correct_dir.patch
-use-editor-instead-of-vi.patch
diff --git a/debian/patches/use-editor-instead-of-vi.patch b/debian/patches/use-editor-instead-of-vi.patch
deleted file mode 100644
index 7b06923..0000000
--- a/debian/patches/use-editor-instead-of-vi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: commit-patch/commit-patch
-===================================================================
---- commit-patch.orig/commit-patch	2019-02-13 23:18:12.007932991 -0800
-+++ commit-patch/commit-patch	2019-02-13 23:18:35.996431443 -0800
-@@ -178,7 +178,7 @@
- 
-         run([split(/ /,$vc{diff}), @ARGV], '>>', $patch);
-     }
--    system(($ENV{VISUAL} || $ENV{EDITOR} || 'vi')." ".$patch);
-+    system(($ENV{VISUAL} || $ENV{EDITOR} || 'editor')." ".$patch);
-     my $last_patch = "#last-comit-partial.patch";
-     unlink "$last_patch.3";
-     rename "$last_patch.2", "$last_patch.3";
diff --git a/debian/rules b/debian/rules
index fdfd5fe..07978bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,13 @@
 #export DH_VERBOSE=1
 
 override_dh_auto_install:
-	make install PREFIX=debian/commit-patch/usr
+	make install PREFIX=debian/commit-patch/usr LISPDIR=/share/emacs/site-lisp/commit-patch
 	# No need for another copy of the GPL:
 	rm debian/commit-patch/usr/share/doc/commit-patch/COPYING
 	# Installed by dh_installchangelogs:
 	rm debian/commit-patch/usr/share/doc/commit-patch/Changes
+	# Set the correct debian editor
+	sed -i 's/FALLBACK_EDITOR *=.*/FALLBACK_EDITOR = "editor";/' debian/commit-patch/usr/bin/commit-patch
 
 # Skip tests. They aren't mature enough to offer any benefit during packaging.
 override_dh_auto_test: