diff --git a/debian/changelog b/debian/changelog
index b439f42..4a254ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+magicrescue (1.1.10+git20181202.7ae1f59-1) UNRELEASED; urgency=medium
+
+  [ Debian Janitor ]
+  * New upstream snapshot.
+
+  [  ]
+  * Drop patch 030_fix-textextract-crash.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 10 Mar 2020 05:37:35 +0000
+
 magicrescue (1.1.10-3) unstable; urgency=medium
 
   [ Joao Eriberto Mota Filho ]
diff --git a/debian/patches/030_fix-textextract-crash.patch b/debian/patches/030_fix-textextract-crash.patch
deleted file mode 100644
index 5709d8a..0000000
--- a/debian/patches/030_fix-textextract-crash.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: fix getopt use in tools
-             Removed the home-made special-casing for `--help`. It's
-             not needed and wasn't interacting right with `getopt`.
-Author: Jonas Jensen <jbj@knef.dk>
-Bug-Debian: http://bugs.debian.org/716387
-Last-Update: 2018-12-02
-Index: magicrescue/tools/safecat.c
-===================================================================
---- magicrescue.orig/tools/safecat.c
-+++ magicrescue/tools/safecat.c
-@@ -72,7 +72,7 @@ int main(int argc, char **argv)
- 	}
-     }
- 
--    if (argc - optind != 1 || strcmp(argv[optind], "--help") == 0) {
-+    if (argc - optind != 1) {
- 	usage();
- 	return 1;
-     }
-Index: magicrescue/tools/textextract.c
-===================================================================
---- magicrescue.orig/tools/textextract.c
-+++ magicrescue/tools/textextract.c
-@@ -317,11 +317,6 @@ int main(int argc, char **argv)
-     
-     int c, outfd;
- 
--    if (argc < 2 || strcmp(argv[1], "--help") == 0) {
--	usage();
--	return 1;
--    }
--
-     while ((c = getopt(argc, argv, "M:s:b:l:r:")) >= 0) {
- 	switch (c) {
- 	case 'M':
-@@ -351,6 +346,11 @@ int main(int argc, char **argv)
- 	}
-     }
- 
-+    if (argc - optind != 1) {
-+	usage();
-+	return 1;
-+    }
-+
-     if (strcmp(argv[optind], "-") == 0) {
- 	outfd = 1;
-     } else if ((outfd = 
diff --git a/debian/patches/series b/debian/patches/series
index 4d1d3c9..a7182d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 010_fix-manpage.patch
 020_add-Perl-preprocessor.patch
-030_fix-textextract-crash.patch
diff --git a/tools/safecat.c b/tools/safecat.c
index f1846a5..5e32d4d 100644
--- a/tools/safecat.c
+++ b/tools/safecat.c
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 	}
     }
 
-    if (argc - optind != 1 || strcmp(argv[optind], "--help") == 0) {
+    if (argc - optind != 1) {
 	usage();
 	return 1;
     }
diff --git a/tools/textextract.c b/tools/textextract.c
index 2435c8a..07b50df 100644
--- a/tools/textextract.c
+++ b/tools/textextract.c
@@ -317,11 +317,6 @@ int main(int argc, char **argv)
     
     int c, outfd;
 
-    if (argc < 2 || strcmp(argv[1], "--help") == 0) {
-	usage();
-	return 1;
-    }
-
     while ((c = getopt(argc, argv, "M:s:b:l:r:")) >= 0) {
 	switch (c) {
 	case 'M':
@@ -351,6 +346,11 @@ int main(int argc, char **argv)
 	}
     }
 
+    if (argc - optind != 1) {
+	usage();
+	return 1;
+    }
+
     if (strcmp(argv[optind], "-") == 0) {
 	outfd = 1;
     } else if ((outfd =