diff -u libdigest-whirlpool-perl-1.09/debian/changelog libdigest-whirlpool-perl-1.09/debian/changelog
--- libdigest-whirlpool-perl-1.09/debian/changelog
+++ libdigest-whirlpool-perl-1.09/debian/changelog
@@ -1,32 +1,12 @@
-libdigest-whirlpool-perl (1.09-1build5) artful; urgency=medium
+libdigest-whirlpool-perl (1.09-1.1) unstable; urgency=medium
 
-  * No-change rebuild for perl 5.26.0.
+  * Non-maintainer upload.
+  * Fix "libdigest-whirlpool-perl FTBFS on s390x: test failure":
+    cherry-pick 66405ec from upstream git:
+    https://github.com/avar/digest-whirlpool/commit/66405ec9ca44492a38a82c2d7fa98c291d46eef1
+    (Closes: #869357)
 
- -- Matthias Klose <doko@ubuntu.com>  Wed, 26 Jul 2017 20:05:59 +0000
-
-libdigest-whirlpool-perl (1.09-1build4) zesty; urgency=medium
-
-  * No-change rebuild for perl 5.24 transition
-
- -- Iain Lane <iain@orangesquash.org.uk>  Mon, 24 Oct 2016 10:17:52 +0100
-
-libdigest-whirlpool-perl (1.09-1build3) xenial; urgency=medium
-
-  * Rebuild for Perl 5.22.1.
-
- -- Colin Watson <cjwatson@ubuntu.com>  Thu, 17 Dec 2015 15:30:11 +0000
-
-libdigest-whirlpool-perl (1.09-1build2) utopic; urgency=medium
-
-  * Rebuild for Perl 5.20.0.
-
- -- Colin Watson <cjwatson@ubuntu.com>  Wed, 20 Aug 2014 12:07:02 +0100
-
-libdigest-whirlpool-perl (1.09-1build1) trusty; urgency=low
-
-  * Rebuild for Perl 5.18.
-
- -- Colin Watson <cjwatson@ubuntu.com>  Mon, 21 Oct 2013 09:58:21 +0100
+ -- gregor herrmann <gregoa@debian.org>  Mon, 31 Jul 2017 16:32:36 -0400
 
 libdigest-whirlpool-perl (1.09-1) unstable; urgency=low
 
only in patch2:
unchanged:
--- libdigest-whirlpool-perl-1.09.orig/Whirlpool.xs
+++ libdigest-whirlpool-perl-1.09/Whirlpool.xs
@@ -15,7 +15,6 @@
 new(SV * class)
 CODE:
     Digest__Whirlpool self;
-    SV * self_ref;
     const char * pkg;
 
     /* Figure out what class we're supposed to bless into, handle
@@ -34,7 +33,6 @@
        containing its memory location */
     Newz(0, self, 1, struct whirlpool);
     NESSIEinit(&self->state);
-    self_ref = newRV_noinc((SV *) self);
 
     RETVAL = newSV(0); /* This gets mortalized automagically */
     sv_setref_pv(RETVAL, pkg, (void*)self);