diff -Nru htdig-3.2.0b6/debian/changelog htdig-3.2.0b6/debian/changelog
--- htdig-3.2.0b6/debian/changelog	2016-08-04 05:05:44.000000000 +0000
+++ htdig-3.2.0b6/debian/changelog	2017-08-22 01:47:57.000000000 +0000
@@ -1,3 +1,12 @@
+htdig (1:3.2.0b6-17) unstable; urgency=medium
+
+  * QA upload.
+  * Fix FTBFS with gcc-7.  Closes: #853445.
+  * dh 10.
+  * Drop redundant build-depends on autoreconf.
+
+ -- Adam Borowski <kilobyte@angband.pl>  Tue, 22 Aug 2017 03:47:57 +0200
+
 htdig (1:3.2.0b6-16) unstable; urgency=medium
 
   * QA upload.
diff -Nru htdig-3.2.0b6/debian/compat htdig-3.2.0b6/debian/compat
--- htdig-3.2.0b6/debian/compat	2016-08-04 04:10:44.000000000 +0000
+++ htdig-3.2.0b6/debian/compat	2017-08-22 01:47:31.000000000 +0000
@@ -1 +1 @@
-9
+10
diff -Nru htdig-3.2.0b6/debian/control htdig-3.2.0b6/debian/control
--- htdig-3.2.0b6/debian/control	2016-08-04 04:11:18.000000000 +0000
+++ htdig-3.2.0b6/debian/control	2017-08-22 01:47:56.000000000 +0000
@@ -2,9 +2,8 @@
 Section: web
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 9), zlib1g-dev, flex, bison, dh-autoreconf,
-	       autotools-dev
-Standards-Version: 3.9.8
+Build-Depends: debhelper (>= 10), zlib1g-dev, flex, bison
+Standards-Version: 4.1.0
 
 Package: htdig
 Architecture: any
diff -Nru htdig-3.2.0b6/debian/patches/drop-bogus-assignment htdig-3.2.0b6/debian/patches/drop-bogus-assignment
--- htdig-3.2.0b6/debian/patches/drop-bogus-assignment	1970-01-01 00:00:00.000000000 +0000
+++ htdig-3.2.0b6/debian/patches/drop-bogus-assignment	2017-08-22 01:47:57.000000000 +0000
@@ -0,0 +1,16 @@
+--- htdig-3.2.0b6.orig/htdig/Parsable.cc
++++ htdig-3.2.0b6/htdig/Parsable.cc
+@@ -74,7 +74,6 @@ Parsable::addString(Retriever& retriever
+ 	    retriever.got_word(w, wordindex++, slot); // slot for img_alt
+ 	w = HtWordToken(0);
+     }
+-    w = '\0';
+ }
+ 
+ //*****************************************************************************
+@@ -92,5 +91,4 @@ Parsable::addKeywordString(Retriever& re
+ 	    retriever.got_word(w, wordindex++, 9);
+ 	w = HtWordToken(0);
+     }
+-    w = '\0';
+ }
diff -Nru htdig-3.2.0b6/debian/patches/series htdig-3.2.0b6/debian/patches/series
--- htdig-3.2.0b6/debian/patches/series	2016-08-04 05:03:31.000000000 +0000
+++ htdig-3.2.0b6/debian/patches/series	2017-08-22 01:47:57.000000000 +0000
@@ -2,3 +2,4 @@
 kfreebsd
 gcc-6
 sourceforge_logo
+drop-bogus-assignment