diff -Nru debsig-verify-0.16/aclocal.m4 debsig-verify-0.17/aclocal.m4
--- debsig-verify-0.16/aclocal.m4	2017-01-24 01:10:20.000000000 +0000
+++ debsig-verify-0.17/aclocal.m4	2017-08-12 22:25:11.000000000 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -296,7 +296,7 @@
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
 
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -311,7 +311,7 @@
 [am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.15.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -327,14 +327,14 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -386,7 +386,7 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -417,7 +417,7 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -608,7 +608,7 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -684,7 +684,7 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -881,7 +881,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -902,7 +902,7 @@
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -923,7 +923,7 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -973,7 +973,7 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1012,7 +1012,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1041,7 +1041,7 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1088,7 +1088,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1107,7 +1107,7 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1188,7 +1188,7 @@
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1248,7 +1248,7 @@
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1276,7 +1276,7 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1295,7 +1295,7 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru debsig-verify-0.16/build-aux/depcomp debsig-verify-0.17/build-aux/depcomp
--- debsig-verify-0.16/build-aux/depcomp	2017-01-24 01:10:20.000000000 +0000
+++ debsig-verify-0.17/build-aux/depcomp	2017-08-12 22:25:11.000000000 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -786,6 +786,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -Nru debsig-verify-0.16/config.h.in debsig-verify-0.17/config.h.in
--- debsig-verify-0.16/config.h.in	2017-01-24 01:10:20.000000000 +0000
+++ debsig-verify-0.17/config.h.in	2017-08-12 22:25:11.000000000 +0000
@@ -3,8 +3,8 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `xmlparse' library (-lxmlparse). */
-#undef HAVE_LIBXMLPARSE
+/* Define to 1 if you have the `expat' library (-lexpat). */
+#undef HAVE_LIBEXPAT
 
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
diff -Nru debsig-verify-0.16/configure debsig-verify-0.17/configure
--- debsig-verify-0.16/configure	2017-01-24 01:10:20.000000000 +0000
+++ debsig-verify-0.17/configure	2017-08-12 22:25:11.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for debsig-verify 0.16.
+# Generated by GNU Autoconf 2.69 for debsig-verify 0.17.
 #
 # Report bugs to <debian-dpkg@lists.debian.org>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='debsig-verify'
 PACKAGE_TARNAME='debsig-verify'
-PACKAGE_VERSION='0.16'
-PACKAGE_STRING='debsig-verify 0.16'
+PACKAGE_VERSION='0.17'
+PACKAGE_STRING='debsig-verify 0.17'
 PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org'
 PACKAGE_URL=''
 
@@ -1297,7 +1297,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures debsig-verify 0.16 to adapt to many kinds of systems.
+\`configure' configures debsig-verify 0.17 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1368,7 +1368,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of debsig-verify 0.16:";;
+     short | recursive ) echo "Configuration of debsig-verify 0.17:";;
    esac
   cat <<\_ACEOF
 
@@ -1469,7 +1469,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-debsig-verify configure 0.16
+debsig-verify configure 0.17
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1825,7 +1825,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by debsig-verify $as_me 0.16, which was
+It was created by debsig-verify $as_me 0.17, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4290,7 +4290,7 @@
 
 # Define the identity of the package.
  PACKAGE='debsig-verify'
- VERSION='0.16'
+ VERSION='0.17'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5155,13 +5155,13 @@
 AUTOM4TE=${AUTOM4TE-"${am_missing_run}autom4te"}
 
 # Checks for libraries.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lxmlparse" >&5
-$as_echo_n "checking for XML_ParserCreate in -lxmlparse... " >&6; }
-if ${ac_cv_lib_xmlparse_XML_ParserCreate+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
+$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
+if ${ac_cv_lib_expat_XML_ParserCreate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lxmlparse  $LIBS"
+LIBS="-lexpat  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5181,22 +5181,22 @@
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_xmlparse_XML_ParserCreate=yes
+  ac_cv_lib_expat_XML_ParserCreate=yes
 else
-  ac_cv_lib_xmlparse_XML_ParserCreate=no
+  ac_cv_lib_expat_XML_ParserCreate=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xmlparse_XML_ParserCreate" >&5
-$as_echo "$ac_cv_lib_xmlparse_XML_ParserCreate" >&6; }
-if test "x$ac_cv_lib_xmlparse_XML_ParserCreate" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+if test "x$ac_cv_lib_expat_XML_ParserCreate" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXMLPARSE 1
+#define HAVE_LIBEXPAT 1
 _ACEOF
 
-  LIBS="-lxmlparse $LIBS"
+  LIBS="-lexpat $LIBS"
 
 fi
 
@@ -6157,7 +6157,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by debsig-verify $as_me 0.16, which was
+This file was extended by debsig-verify $as_me 0.17, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6223,7 +6223,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-debsig-verify config.status 0.16
+debsig-verify config.status 0.17
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru debsig-verify-0.16/configure.ac debsig-verify-0.17/configure.ac
--- debsig-verify-0.16/configure.ac	2017-01-24 01:10:20.000000000 +0000
+++ debsig-verify-0.17/configure.ac	2017-08-11 22:12:43.000000000 +0000
@@ -45,7 +45,7 @@
 AM_MISSING_PROG([AUTOM4TE], [autom4te]) dnl Needed by autotest
 
 # Checks for libraries.
-AC_CHECK_LIB([xmlparse], [XML_ParserCreate])
+AC_CHECK_LIB([expat], [XML_ParserCreate])
 PKG_CHECK_MODULES([LIBDPKG], [libdpkg >= 1.18.8])
 
 # Checks for header files.
diff -Nru debsig-verify-0.16/debian/changelog debsig-verify-0.17/debian/changelog
--- debsig-verify-0.16/debian/changelog	2017-01-24 01:10:20.000000000 +0000
+++ debsig-verify-0.17/debian/changelog	2017-08-12 22:25:11.000000000 +0000
@@ -1,3 +1,14 @@
+debsig-verify (0.17) unstable; urgency=medium
+
+  * Spelling fixes. Thanks to Josh Soref <jsoref@gmail.com>.
+  * Switch from libxmltok (expat 1.x) to libexpat (expat 2.x). The latter
+    package is slightly bigger, but that is offset by being used by many
+    more package, and more importantly being maintained upstream.
+  * Bump Standard-Version to 4.0.1 (no changes needed).
+  * Switch to debhelper compatibility level 10.
+
+ -- Guillem Jover <guillem@debian.org>  Sun, 13 Aug 2017 00:25:11 +0200
+
 debsig-verify (0.16) unstable; urgency=medium
 
   * Wrap dependency fields in debian/control.
@@ -224,7 +235,7 @@
   * Added some code to free up alloc'd memory used by parsePolicy()
   * Lots of code cleanups
   * Added a -d option for debug output
-  * Change to use "gpg --verify <sig> <file>" intead of stdin. The newest
+  * Change to use "gpg --verify <sig> <file>" instead of stdin. The newest
     gpg changed this behavior to fix a security issue.
   * Use obstack to alloc policy data in xml-parts.c
 
diff -Nru debsig-verify-0.16/debian/compat debsig-verify-0.17/debian/compat
--- debsig-verify-0.16/debian/compat	2014-06-07 19:41:26.000000000 +0000
+++ debsig-verify-0.17/debian/compat	2017-08-11 22:14:05.000000000 +0000
@@ -1 +1 @@
-9
+10
diff -Nru debsig-verify-0.16/debian/control debsig-verify-0.17/debian/control
--- debsig-verify-0.16/debian/control	2017-01-24 01:10:20.000000000 +0000
+++ debsig-verify-0.17/debian/control	2017-08-11 22:14:05.000000000 +0000
@@ -6,12 +6,12 @@
 Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/debsig-verify.git
 Vcs-Git: https://anonscm.debian.org/git/dpkg/debsig-verify.git
 Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 10),
  pkg-config,
  libdpkg-dev (>= 1.18.11),
- libxmltok1-dev,
+ libexpat1-dev,
  gnupg <!nocheck>,
-Standards-Version: 3.9.8
+Standards-Version: 4.0.1
 
 Package: debsig-verify
 Architecture: any
diff -Nru debsig-verify-0.16/doc/policy-syntax.txt debsig-verify-0.17/doc/policy-syntax.txt
--- debsig-verify-0.16/doc/policy-syntax.txt	2014-10-28 02:52:18.000000000 +0000
+++ debsig-verify-0.17/doc/policy-syntax.txt	2017-03-06 04:47:47.000000000 +0000
@@ -50,7 +50,7 @@
 
   MinOptional	- This is the minimum number of Optional types that must be
 		  present and verified for this group. This is given as an
-		  attribute to the Verfication and Selection nodes.
+		  attribute to the Verification and Selection nodes.
 
 There are three types of matching rules within the two blocks.
 
diff -Nru debsig-verify-0.16/Makefile.am debsig-verify-0.17/Makefile.am
--- debsig-verify-0.16/Makefile.am	2016-10-29 02:24:25.000000000 +0000
+++ debsig-verify-0.17/Makefile.am	2017-08-11 22:12:43.000000000 +0000
@@ -15,7 +15,7 @@
 	$(nil)
 LDADD = \
 	$(LIBDPKG_LIBS) \
-	-lxmlparse
+	-lexpat
 
 
 bin_PROGRAMS = src/debsig-verify
diff -Nru debsig-verify-0.16/Makefile.in debsig-verify-0.17/Makefile.in
--- debsig-verify-0.16/Makefile.in	2017-01-24 01:10:20.000000000 +0000
+++ debsig-verify-0.17/Makefile.in	2017-08-12 22:25:11.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -384,7 +384,7 @@
 
 LDADD = \
 	$(LIBDPKG_LIBS) \
-	-lxmlparse
+	-lexpat
 
 src_debsig_verify_SOURCES = \
 	src/ar-parse.c \
@@ -778,7 +778,7 @@
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -803,7 +803,7 @@
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -821,7 +821,7 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -831,7 +831,7 @@
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
diff -Nru debsig-verify-0.16/README debsig-verify-0.17/README
--- debsig-verify-0.16/README	2017-01-24 01:10:20.000000000 +0000
+++ debsig-verify-0.17/README	2017-08-11 22:12:43.000000000 +0000
@@ -65,7 +65,7 @@
   GNU make
   pkg-config
   libdpkg-dev
-  libxmltok1-dev
+  libexpat1-dev
 
 The build process is done by running the usual «./configure; make check».
 To see all available configuration options please run «./configure --help».
diff -Nru debsig-verify-0.16/src/xml-parse.c debsig-verify-0.17/src/xml-parse.c
--- debsig-verify-0.16/src/xml-parse.c	2016-10-29 02:24:20.000000000 +0000
+++ debsig-verify-0.17/src/xml-parse.c	2017-08-11 22:12:43.000000000 +0000
@@ -19,7 +19,7 @@
  */
 
 /*
- * provides the XML parsing code for policy files, via expat (xmltok)
+ * Provides the XML parsing code for policy files, via expat.
  */
 
 #include <config.h>
@@ -33,7 +33,7 @@
 #include <obstack.h>
 
 #include <dpkg/dpkg.h>
-#include <xmltok/xmlparse.h>
+#include <expat.h>
 
 #include "debsig.h"
 
@@ -50,7 +50,7 @@
 #define parse_error(fmt, args...) \
 { \
     parse_err_cnt++; \
-    ds_printf(DS_LEV_DEBUG , "%d: " fmt , XML_GetCurrentLineNumber(parser) , ## args); \
+    ds_printf(DS_LEV_DEBUG , "%lu: " fmt , XML_GetCurrentLineNumber(parser) , ## args); \
 }
 
 static void
@@ -284,7 +284,7 @@
 	done = len < sizeof(buf);
 	if (!XML_Parse(parser, buf, len, done)) {
 	    ds_printf(DS_LEV_DEBUG,
-		"%s at line %d",
+		"%s at line %lu",
 		XML_ErrorString(XML_GetErrorCode(parser)),
 		XML_GetCurrentLineNumber(parser));
 	    parse_err_cnt++;
diff -Nru debsig-verify-0.16/test/Makefile.in debsig-verify-0.17/test/Makefile.in
--- debsig-verify-0.16/test/Makefile.in	2017-01-24 01:10:20.000000000 +0000
+++ debsig-verify-0.17/test/Makefile.in	2017-08-12 22:25:11.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru debsig-verify-0.16/test/package.m4 debsig-verify-0.17/test/package.m4
--- debsig-verify-0.16/test/package.m4	2017-01-24 01:10:20.000000000 +0000
+++ debsig-verify-0.17/test/package.m4	2017-08-12 22:25:11.000000000 +0000
@@ -1,6 +1,6 @@
 # Signature of the current package.
 m4_define([AT_PACKAGE_NAME],      [debsig-verify])
 m4_define([AT_PACKAGE_TARNAME],   [debsig-verify])
-m4_define([AT_PACKAGE_VERSION],   [0.16])
-m4_define([AT_PACKAGE_STRING],    [debsig-verify 0.16])
+m4_define([AT_PACKAGE_VERSION],   [0.17])
+m4_define([AT_PACKAGE_STRING],    [debsig-verify 0.17])
 m4_define([AT_PACKAGE_BUGREPORT], [debian-dpkg@lists.debian.org])
diff -Nru debsig-verify-0.16/test/testsuite debsig-verify-0.17/test/testsuite
--- debsig-verify-0.16/test/testsuite	2017-01-24 01:10:20.000000000 +0000
+++ debsig-verify-0.17/test/testsuite	2017-08-12 22:25:11.000000000 +0000
@@ -909,7 +909,7 @@
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-debsig-verify 0.16 test suite test groups:
+debsig-verify 0.17 test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -950,7 +950,7 @@
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (debsig-verify 0.16)" &&
+  $as_echo "$as_me (debsig-verify 0.17)" &&
   cat <<\_ATEOF || at_write_fail=1
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1133,11 +1133,11 @@
 
 # Banners and logs.
 $as_echo "## ------------------------------ ##
-## debsig-verify 0.16 test suite. ##
+## debsig-verify 0.17 test suite. ##
 ## ------------------------------ ##"
 {
   $as_echo "## ------------------------------ ##
-## debsig-verify 0.16 test suite. ##
+## debsig-verify 0.17 test suite. ##
 ## ------------------------------ ##"
   echo
 
@@ -1981,7 +1981,7 @@
   $as_echo "Please send $at_msg and all information you think might help:
 
    To: <debian-dpkg@lists.debian.org>
-   Subject: [debsig-verify 0.16] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+   Subject: [debsig-verify 0.17] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
diff -Nru debsig-verify-0.16/TODO debsig-verify-0.17/TODO
--- debsig-verify-0.16/TODO	2014-10-30 23:02:48.000000000 +0000
+++ debsig-verify-0.17/TODO	2017-03-06 04:47:47.000000000 +0000
@@ -5,7 +5,7 @@
     using the --with-colon and --status-fd output for better parsing of
     the verify and keyring output.
 
-* Figure out how to integrate this more tigthly with the package tools
+* Figure out how to integrate this more tightly with the package tools
   (apt, dpkg etc..).
 
 * Expiry still needs to be handled.