diff -Nru paperkey-1.5/debian/changelog paperkey-1.5/debian/changelog
--- paperkey-1.5/debian/changelog	2017-11-15 06:21:09.000000000 +0000
+++ paperkey-1.5/debian/changelog	2017-11-20 14:13:31.000000000 +0000
@@ -1,3 +1,10 @@
+paperkey (1.5-3) unstable; urgency=medium
+
+  * clear up autoconf stuff from future imports
+  * Use upstream patch to fix running the test suite in parallel
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Mon, 20 Nov 2017 15:13:31 +0100
+
 paperkey (1.5-2) unstable; urgency=medium
 
   * avoid parallel test suite (Closes: #881792)
diff -Nru paperkey-1.5/debian/gbp.conf paperkey-1.5/debian/gbp.conf
--- paperkey-1.5/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ paperkey-1.5/debian/gbp.conf	2017-11-20 14:13:31.000000000 +0000
@@ -0,0 +1,15 @@
+[DEFAULT]
+pristine-tar = True
+
+[import-orig]
+filter = [
+ 'INSTALL',
+ 'Makefile.in',
+ 'aclocal.m4',
+ '*/Makefile.in',
+ 'configure',
+ 'depcomp',
+ 'install-sh',
+ 'missing',
+ ]
+filter-pristine-tar = False
diff -Nru paperkey-1.5/debian/patches/0001-clean-up-parallel-test-suite.patch paperkey-1.5/debian/patches/0001-clean-up-parallel-test-suite.patch
--- paperkey-1.5/debian/patches/0001-clean-up-parallel-test-suite.patch	1970-01-01 00:00:00.000000000 +0000
+++ paperkey-1.5/debian/patches/0001-clean-up-parallel-test-suite.patch	2017-11-20 14:13:31.000000000 +0000
@@ -0,0 +1,106 @@
+From: David Shaw <dshaw@jabberwocky.com>
+Date: Mon, 20 Nov 2017 15:08:56 +0100
+Subject: clean up parallel test suite.
+
+This will certainly be in the next release.
+
+(from private mail to dkg@fifthhorseman.net)
+---
+ checks/Makefile.am       | 2 +-
+ checks/bad-crc-base16.sh | 6 +++++-
+ checks/bad-crc-raw.sh    | 6 +++++-
+ checks/bad-primary.sh    | 2 +-
+ checks/bad-subkey.sh     | 2 +-
+ checks/roundtrip-raw.sh  | 4 ++--
+ checks/roundtrip.sh      | 4 ++--
+ 7 files changed, 17 insertions(+), 9 deletions(-)
+
+diff --git a/checks/Makefile.am b/checks/Makefile.am
+index f0285d4..773f435 100644
+--- a/checks/Makefile.am
++++ b/checks/Makefile.am
+@@ -1,3 +1,3 @@
+ TESTS=roundtrip.sh roundtrip-raw.sh bad-crc-base16.sh bad-crc-raw.sh bad-primary.sh bad-subkey.sh
+ EXTRA_DIST=$(TESTS) papertest-rsa.pub papertest-rsa.sec papertest-dsaelg.pub papertest-dsaelg.sec papertest-ecc.pub papertest-ecc.sec papertest-eddsa.pub papertest-eddsa.sec papertest-100.pub papertest-100.sec papertest-dsa100.pub papertest-dsa100.sec corrupt-base16.txt corrupt-raw.bin 
+-CLEANFILES=papertest-*.txt regen.pgp papertest-*.bin
++CLEANFILES=papertest-*.txt regen-*.pgp papertest-*.bin
+diff --git a/checks/bad-crc-base16.sh b/checks/bad-crc-base16.sh
+index d18880c..ec457fb 100755
+--- a/checks/bad-crc-base16.sh
++++ b/checks/bad-crc-base16.sh
+@@ -1,4 +1,8 @@
+ #!/bin/sh
+ 
+-../paperkey --secrets ${srcdir}/corrupt-base16.txt --pubring ${srcdir}/papertest.pub --output regen.pgp 2>/dev/null && exit 1
++../paperkey --secrets ${srcdir}/corrupt-base16.txt --pubring ${srcdir}/papertest.pub >/dev/null 2>&1
++if test $? -ne 1 ; then
++    exit 1
++fi
++
+ exit 0
+diff --git a/checks/bad-crc-raw.sh b/checks/bad-crc-raw.sh
+index 44a43af..2cf8bd6 100755
+--- a/checks/bad-crc-raw.sh
++++ b/checks/bad-crc-raw.sh
+@@ -1,4 +1,8 @@
+ #!/bin/sh
+ 
+-../paperkey --secrets ${srcdir}/corrupt-raw.bin --pubring ${srcdir}/papertest.pub --output regen.pgp 2>/dev/null && exit 1
++../paperkey --secrets ${srcdir}/corrupt-raw.bin --pubring ${srcdir}/papertest.pub >/dev/null 2>&1
++if test $? -ne 1 ; then
++    exit 1
++fi
++
+ exit 0
+diff --git a/checks/bad-primary.sh b/checks/bad-primary.sh
+index 2c8cad6..d60d334 100755
+--- a/checks/bad-primary.sh
++++ b/checks/bad-primary.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-../paperkey --secret-key ${srcdir}/papertest-100.sec --output papertest-100.txt 2>/dev/null
++../paperkey --secret-key ${srcdir}/papertest-100.sec >/dev/null 2>&1
+ if test $? -ne 1 ; then
+     exit 1
+ fi
+diff --git a/checks/bad-subkey.sh b/checks/bad-subkey.sh
+index ef38199..f453d7c 100755
+--- a/checks/bad-subkey.sh
++++ b/checks/bad-subkey.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-../paperkey --secret-key ${srcdir}/papertest-dsa100.sec --output papertest-dsa100.txt 2>/dev/null
++../paperkey --secret-key ${srcdir}/papertest-dsa100.sec >/dev/null 2>&1
+ if test $? -ne 1 ; then
+     exit 1
+ fi
+diff --git a/checks/roundtrip-raw.sh b/checks/roundtrip-raw.sh
+index 6579690..b35c61c 100755
+--- a/checks/roundtrip-raw.sh
++++ b/checks/roundtrip-raw.sh
+@@ -2,7 +2,7 @@
+ 
+ for type in rsa dsaelg ecc eddsa ; do
+     ../paperkey --secret-key ${srcdir}/papertest-${type}.sec --output-type raw --output papertest-${type}.bin || exit 1
+-    ../paperkey --secrets papertest-${type}.bin --pubring ${srcdir}/papertest-${type}.pub --output regen.pgp || exit 1
+-    cmp ./regen.pgp ${srcdir}/papertest-${type}.sec || exit 1
++    ../paperkey --secrets papertest-${type}.bin --pubring ${srcdir}/papertest-${type}.pub --output regen-raw-${type}.pgp || exit 1
++    cmp ./regen-raw-${type}.pgp ${srcdir}/papertest-${type}.sec || exit 1
+     /bin/echo -n "$type "
+ done
+diff --git a/checks/roundtrip.sh b/checks/roundtrip.sh
+index 20523d0..781ccd6 100755
+--- a/checks/roundtrip.sh
++++ b/checks/roundtrip.sh
+@@ -2,7 +2,7 @@
+ 
+ for type in rsa dsaelg ecc eddsa ; do
+     ../paperkey --secret-key ${srcdir}/papertest-${type}.sec --output papertest-${type}.txt || exit 1
+-    ../paperkey --secrets papertest-${type}.txt --pubring ${srcdir}/papertest-${type}.pub --output regen.pgp || exit 1
+-    cmp ./regen.pgp ${srcdir}/papertest-${type}.sec || exit 1
++    ../paperkey --secrets papertest-${type}.txt --pubring ${srcdir}/papertest-${type}.pub --output regen-${type}.pgp || exit 1
++    cmp ./regen-${type}.pgp ${srcdir}/papertest-${type}.sec || exit 1
+     /bin/echo -n "$type "
+ done
diff -Nru paperkey-1.5/debian/patches/series paperkey-1.5/debian/patches/series
--- paperkey-1.5/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ paperkey-1.5/debian/patches/series	2017-11-20 14:13:31.000000000 +0000
@@ -0,0 +1 @@
+0001-clean-up-parallel-test-suite.patch
diff -Nru paperkey-1.5/debian/rules paperkey-1.5/debian/rules
--- paperkey-1.5/debian/rules	2017-11-15 06:09:02.000000000 +0000
+++ paperkey-1.5/debian/rules	2017-11-20 14:13:31.000000000 +0000
@@ -6,6 +6,3 @@
 %:
 	dh $@ \
 		--builddirectory=build
-
-override_dh_auto_test:
-	dh_auto_test --builddirectory=build --no-parallel