diff -Nru strip-nondeterminism-0.025/bin/dh_strip_nondeterminism strip-nondeterminism-0.029/bin/dh_strip_nondeterminism
--- strip-nondeterminism-0.025/bin/dh_strip_nondeterminism	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/bin/dh_strip_nondeterminism	2016-12-22 10:52:33.000000000 +0000
@@ -11,7 +11,6 @@
 use Debian::Debhelper::Dh_Lib;
 use File::StripNondeterminism;
 use Date::Parse;
-use POSIX qw(tzset);
 
 =head1 SYNOPSIS
 
@@ -46,6 +45,7 @@
 init();
 
 my @nondeterministic_files;
+
 sub testfile {
 	return if -l $_ or -d $_; # Skip directories and symlinks always.
 
@@ -62,8 +62,7 @@
 	}
 }
 
-$ENV{'TZ'} = 'UTC';
-tzset();
+File::StripNondeterminism::init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
@@ -72,7 +71,8 @@
 	find(\&testfile,$tmp);
 	next unless @nondeterministic_files;
 
-	$File::StripNondeterminism::canonical_time = eval { get_source_date_epoch() };
+	$File::StripNondeterminism::canonical_time
+	  = eval { get_source_date_epoch() };
 	if (not defined $File::StripNondeterminism::canonical_time) {
 		# Hack for old versions of debhelper
 		isnative($package); # Sets $dh{DATE} as a side-effect
@@ -81,7 +81,8 @@
 
 	foreach (@nondeterministic_files) {
 		my ($path, $normalize) = @$_;
-		eval { $normalize->($path); 1 } or die "dh_strip_nondeterminism: $path: $@";
+		eval { $normalize->($path); 1 }
+		  or die "dh_strip_nondeterminism: $path: $@";
 	}
 }
 
diff -Nru strip-nondeterminism-0.025/bin/strip-nondeterminism strip-nondeterminism-0.029/bin/strip-nondeterminism
--- strip-nondeterminism-0.025/bin/strip-nondeterminism	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/bin/strip-nondeterminism	2016-12-22 10:52:33.000000000 +0000
@@ -23,22 +23,24 @@
 use warnings;
 
 use File::StripNondeterminism;
-use POSIX qw(tzset);
 use Getopt::Long;
 Getopt::Long::Configure(qw(no_ignore_case permute bundling));
 
 my $cmd = $0;
 $cmd =~ s/.*\///;
-my $usage = "Usage: $cmd [-t|--type FILETYPE] [-T|--timestamp SECONDS] [--clamp-timestamp] FILENAME\n";
+my $usage
+  = "Usage: $cmd [-t|--type FILETYPE] [-T|--timestamp SECONDS] [--clamp-timestamp] FILENAME\n";
 
 my ($filetype, $timestamp, $clamp_timestamp, $want_help, $want_version);
 my $getopt = Getopt::Long::Parser->new;
 $getopt->configure(qw(no_ignore_case permute bundling));
-$getopt->getoptions('type|t=s', \$filetype,
-		    'timestamp|T=i', \$timestamp,
-		    'clamp-timestamp!', \$clamp_timestamp,
-		    'help|h', \$want_help,
-		    'version|V', \$want_version) or die $usage;
+$getopt->getoptions(
+	'type|t=s', \$filetype,
+	'timestamp|T=i', \$timestamp,
+	'clamp-timestamp!', \$clamp_timestamp,
+	'help|h', \$want_help,
+	'version|V', \$want_version
+) or die $usage;
 
 if ($want_help) {
 	print $usage;
@@ -50,8 +52,7 @@
 	exit 0;
 }
 
-$ENV{'TZ'} = 'UTC';
-tzset();
+File::StripNondeterminism::init();
 
 $File::StripNondeterminism::canonical_time = $timestamp;
 $File::StripNondeterminism::clamp_time = $clamp_timestamp;
@@ -59,16 +60,21 @@
 die $usage if @ARGV == 0;
 
 for my $filename (@ARGV) {
+	die "$filename: Does not exist\n" unless -e $filename;
+
 	my $normalizer;
 	if (defined $filetype) {
-		$normalizer = File::StripNondeterminism::get_normalizer_by_name($filetype);
+		$normalizer
+		  = File::StripNondeterminism::get_normalizer_by_name($filetype);
 		die "$filetype: Unknown file type\n" unless $normalizer;
 	} else {
-		$normalizer = File::StripNondeterminism::get_normalizer_for_file($filename);
+		$normalizer
+		  = File::StripNondeterminism::get_normalizer_for_file($filename);
 		next unless $normalizer;
 	}
 
-	eval { $normalizer->($filename); 1 } or die "strip-nondeterminism: $filename: $@";
+	eval { $normalizer->($filename); 1 }
+	  or die "strip-nondeterminism: $filename: $@";
 }
 
 __END__
diff -Nru strip-nondeterminism-0.025/debian/changelog strip-nondeterminism-0.029/debian/changelog
--- strip-nondeterminism-0.025/debian/changelog	2016-09-11 22:15:22.000000000 +0000
+++ strip-nondeterminism-0.029/debian/changelog	2017-01-04 09:33:55.000000000 +0000
@@ -1,14 +1,72 @@
-strip-nondeterminism (0.025-1~14.04.york1) trusty; urgency=medium
+strip-nondeterminism (0.029-2~14.04.york1) trusty; urgency=medium
 
   * debian/rules: disable tests
 
- -- Jonathon Fernyhough <jonathon.fernyhough@york.ac.uk>  Sun, 11 Sep 2016 23:14:14 +0100
+ -- Jonathon Fernyhough <jonathon.fernyhough@york.ac.uk>  Mon, 02 Jan 2017 19:45:50 +0000
 
-strip-nondeterminism (0.025-1~14.04.york0) trusty; urgency=medium
+strip-nondeterminism (0.029-2) unstable; urgency=medium
 
-  * No-change backport to trusty
+  [ Chris Lamb ]
+  * debian/tests/control: Also copy our binaries as they are used in the tests.
+    Closes: #849391
 
- -- Jonathon Fernyhough <jonathon.fernyhough@york.ac.uk>  Sun, 11 Sep 2016 22:14:49 +0100
+ -- Mattia Rizzolo <mattia@debian.org>  Tue, 27 Dec 2016 13:54:57 +0100
+
+strip-nondeterminism (0.029-1) unstable; urgency=medium
+
+  [ Chris Lamb ]
+  * t/binaries.t:
+    - Don't make tests rely on Debian::Debhelper::Dh_Lib for non-Debian
+      distributions.
+    - Smoke test strip-nondeterminism(1) and dh_strip_nondeterminism(1) to
+      prevent regressions like a3c16cd08.
+  * Makefile.PL: Change "NAME" argument to a Perl package name.
+  * .pertidyrc: Inherit/copy from lintian's version but using tabs over spaces.
+  * Run perltidy across codebase.
+
+  [ Reiner Herrmann ]
+  * zip: normalize NTFS FIleTimes. (Closes: #845203)
+
+  [ Anders Kaseorg ]
+  * libfile-stripnondeterminism-perl: Treat .par files as Zip archives.
+    (Closes: #846895)
+
+ -- Chris Lamb <lamby@debian.org>  Thu, 22 Dec 2016 10:55:20 +0000
+
+strip-nondeterminism (0.028-1) unstable; urgency=medium
+
+  * bin/strip-nondeterminism: Add missing semicolon.
+
+ -- Chris Lamb <lamby@debian.org>  Mon, 12 Sep 2016 09:06:01 +0100
+
+strip-nondeterminism (0.027-1) unstable; urgency=medium
+
+  * Add a File::StripNondeterminism::init method to avoid tzset DRY violation.
+    - Also set timezone in tests. (Closes: #837382)
+
+ -- Chris Lamb <lamby@debian.org>  Sun, 11 Sep 2016 23:10:35 +0100
+
+strip-nondeterminism (0.026-1) unstable; urgency=medium
+
+  * handlers/jar.pm: Reintroduce subroutine prototype on _jar_filename_cmp to
+    fix ordering regression in .jar files.
+  * Add a testcase for jar file ordering and normalisation.
+  * bin/strip-nondeterminism: die if file does not exist (Closes: #800159)
+  * debian/rules:
+    - No need for -make hack as we'll have Makefile during package build.
+      (Closes: #836732)
+    - Update clean target to avoid FTBFS twice in a row.
+  * Add Homepage field.
+  * t/fixtures.t:
+    - Add a lookup table for descriptions of stat(1) indices.
+    - Don't test whether inode number has changed.
+    - Check that output matches expected before comparing attributes to make it
+      less confusing on failure.
+    - Re-add top-level "plan" call dropped in 0.024-1.
+    - Add comment why we use a per-fixture temporary directory.
+    - Re-order @fixtures setup for global->specific ordering.
+
+ -- Chris Lamb <lamby@debian.org>  Fri, 09 Sep 2016 11:02:04 +0100
 
 strip-nondeterminism (0.025-1) unstable; urgency=medium
 
diff -Nru strip-nondeterminism-0.025/debian/control strip-nondeterminism-0.029/debian/control
--- strip-nondeterminism-0.025/debian/control	2016-09-11 21:14:46.000000000 +0000
+++ strip-nondeterminism-0.029/debian/control	2016-12-27 12:54:57.000000000 +0000
@@ -14,6 +14,7 @@
  Mattia Rizzolo <mattia@debian.org>,
  Chris Lamb <lamby@debian.org>,
 Standards-Version: 3.9.8
+Homepage: https://reproducible-builds.org/
 Vcs-Git: https://anonscm.debian.org/git/reproducible/strip-nondeterminism.git
 Vcs-Browser: https://anonscm.debian.org/git/reproducible/strip-nondeterminism.git
 
diff -Nru strip-nondeterminism-0.025/debian/rules strip-nondeterminism-0.029/debian/rules
--- strip-nondeterminism-0.025/debian/rules	2016-09-11 22:14:11.000000000 +0000
+++ strip-nondeterminism-0.029/debian/rules	2017-01-02 19:45:47.000000000 +0000
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
 
+%:
+	dh $@
+
 # Remove the auto-generated Makefile to prevent dh_auto_clean from failing
 # if the Makefile contain paths referring to an old version of Perl.
 override_dh_auto_clean:
-	rm -f Makefile
+	rm -rf Makefile MYMETA.* cover_db/ blib/
 	dh_auto_clean
 
 override_dh_auto_test:
-#	cover -test -make 'prove -v -Ilib; return $?;' -ignore_re '^t/'
-
-%:
-	dh $@
+#	cover -test -ignore_re '^t/'
diff -Nru strip-nondeterminism-0.025/debian/tests/control strip-nondeterminism-0.029/debian/tests/control
--- strip-nondeterminism-0.025/debian/tests/control	2016-09-04 16:43:00.000000000 +0000
+++ strip-nondeterminism-0.029/debian/tests/control	2016-12-27 12:53:42.000000000 +0000
@@ -1,2 +1,2 @@
-Test-Command: mkdir "${ADTTMP}/t" && cp -rv t/* "${ADTTMP}/t/" && cd "${ADTTMP}" && perl -MExtUtils::Command::MM -MTest::Harness t/*.t
+Test-Command: mkdir -p "${ADTTMP}" && cp -rv t/ bin/ "${ADTTMP}" && cd "${ADTTMP}" && perl -MExtUtils::Command::MM -MTest::Harness t/*.t
 Restrictions: allow-stderr
diff -Nru strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/ar.pm strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/ar.pm
--- strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/ar.pm	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/ar.pm	2016-12-22 10:52:33.000000000 +0000
@@ -37,7 +37,7 @@
 	my $buf;
 
 	open(my $fh, '+<', $file)
-		or die("failed to open $file for read+write: $!");
+	  or die("failed to open $file for read+write: $!");
 
 	read $fh, $buf, $GLOBAL_HEADER_LENGTH;
 	return 0 if $buf ne $GLOBAL_HEADER;
@@ -59,26 +59,30 @@
 		#58     59     File magic                \140\012
 
 		die "Incorrect header length"
-		if length $buf != $FILE_HEADER_LENGTH;
+		  if length $buf != $FILE_HEADER_LENGTH;
 		die "Incorrect file magic"
-		if substr($buf, 58, length($FILE_MAGIC)) ne $FILE_MAGIC;
+		  if substr($buf, 58, length($FILE_MAGIC)) ne $FILE_MAGIC;
 
 		my $file_mode = oct(substr($buf, 40, 8));
 		my $file_size = substr($buf, 48, 10);
 		seek $fh, $file_header_start + 16, SEEK_SET;
 
 		# mtime
-		syswrite $fh, sprintf("%-12d", $File::StripNondeterminism::canonical_time // 0);
+		syswrite $fh,
+		  sprintf("%-12d", $File::StripNondeterminism::canonical_time // 0);
 		# owner
 		syswrite $fh, sprintf("%-6d", 0);
 		# group
 		syswrite $fh, sprintf("%-6d", 0);
 		# file mode
-		syswrite $fh, sprintf("%-8o", ($file_mode & oct(100)) ? oct(755) : oct(644));
+		syswrite $fh,
+		  sprintf("%-8o", ($file_mode & oct(100)) ? oct(755) : oct(644));
 
 		# move to next member
 		my $padding = $file_size % 2;
-		seek $fh, $file_header_start + $FILE_HEADER_LENGTH + $file_size + $padding, SEEK_SET;
+		seek $fh,
+		  $file_header_start + $FILE_HEADER_LENGTH + $file_size + $padding,
+		  SEEK_SET;
 
 	}
 
diff -Nru strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/gettext.pm strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/gettext.pm
--- strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/gettext.pm	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/gettext.pm	2016-12-22 10:52:33.000000000 +0000
@@ -28,7 +28,8 @@
 	my $filename = shift;
 
 	local $/ = undef;
-	open(my $fh, '<', $filename) or die "Can't open file $filename for reading: $!";
+	open(my $fh, '<', $filename)
+	  or die "Can't open file $filename for reading: $!";
 	binmode($fh);
 	my $buf = <$fh>;
 	close($fh);
@@ -56,7 +57,8 @@
 		return 0;
 	}
 
-	my ($revision, $nstrings, $orig_to, $trans_to) = unpack($fmt x 4, substr($buf, 1*4, 4*4));
+	my ($revision, $nstrings, $orig_to, $trans_to)
+	  = unpack($fmt x 4, substr($buf, 1*4, 4*4));
 	my $major = int($revision / 256);
 	my $minor = int($revision % 256);
 	return 0 if $major > 1;
@@ -74,22 +76,25 @@
 
 		my $pot_date = $1;
 		my $time;
-		eval {
-			$time = Time::Piece->strptime($pot_date, "%Y-%m-%d %H:%M%z");
-		};
+		eval {$time = Time::Piece->strptime($pot_date, "%Y-%m-%d %H:%M%z");};
 		next if $@;
 		next if $time <= $norm_time;
 
 		my $new_time = strftime("%Y-%m-%d %H:%M%z", gmtime($norm_time));
-		$trans_msg =~ s/\QPOT-Creation-Date: $pot_date\E/POT-Creation-Date: $new_time/;
+		$trans_msg
+		  =~ s/\QPOT-Creation-Date: $pot_date\E/POT-Creation-Date: $new_time/;
 		next if length($trans_msg) != $trans_len;
 
-		$buf = substr($buf, 0, $trans_offset) . $trans_msg . substr($buf, $trans_offset + $trans_len);
+		$buf
+		  = substr($buf, 0, $trans_offset)
+		  . $trans_msg
+		  . substr($buf, $trans_offset + $trans_len);
 		$modified = 1;
 	}
 
 	if ($modified) {
-		open(my $fh, '>', $mo_filename) or die "Can't open file $mo_filename for writing: $!";
+		open(my $fh, '>', $mo_filename)
+		  or die "Can't open file $mo_filename for writing: $!";
 		binmode($fh);
 		print $fh $buf;
 		close($fh);
diff -Nru strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/gzip.pm strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/gzip.pm
--- strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/gzip.pm	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/gzip.pm	2016-12-22 10:52:33.000000000 +0000
@@ -36,7 +36,8 @@
 sub normalize {
 	my ($filename) = @_;
 
-	open(my $fh, '<', $filename) or die "Unable to open $filename for reading: $!";
+	open(my $fh, '<', $filename)
+	  or die "Unable to open $filename for reading: $!";
 
 	# See RFC 1952
 
@@ -54,10 +55,13 @@
 
 	my $new_flg = $flg;
 	$new_flg &= ~FNAME;	# Don't include filename
-	$new_flg &= ~FHCRC;	# Don't include header CRC (not all implementations support it)
-	unless ($mtime == 0) {	# Don't set a deterministic timestamp if there wasn't already a timestamp
+	$new_flg &= ~FHCRC
+	  ;	# Don't include header CRC (not all implementations support it)
+	unless ($mtime == 0)
+	{	# Don't set a deterministic timestamp if there wasn't already a timestamp
 		if (defined $File::StripNondeterminism::canonical_time) {
-			if (!$File::StripNondeterminism::clamp_time || $mtime > $File::StripNondeterminism::canonical_time) {
+			if (  !$File::StripNondeterminism::clamp_time
+				|| $mtime > $File::StripNondeterminism::canonical_time) {
 				$mtime = $File::StripNondeterminism::canonical_time;
 			}
 		} else {
@@ -69,7 +73,8 @@
 	my $tempfile = File::Temp->new(DIR => dirname($filename));
 
 	# Write a new header
-	print $tempfile pack('CCCCl<CC', $id1, $id2, $cm, $new_flg, $mtime, $xfl, $os);
+	print $tempfile
+	  pack('CCCCl<CC', $id1, $id2, $cm, $new_flg, $mtime, $xfl, $os);
 
 	if ($flg & FEXTRA) {	# Copy through
 		# 0   1   2
@@ -79,7 +84,8 @@
 		my $buf;
 		read($fh, $buf, 2) == 2 or die "$filename: Malformed gzip file";
 		my ($xlen) = unpack('v', $buf);
-		read($fh, $buf, $xlen) == $xlen or die "$filename: Malformed gzip file";
+		read($fh, $buf, $xlen) == $xlen
+		  or die "$filename: Malformed gzip file";
 		print $tempfile pack('vA*', $xlen, $buf);
 	}
 	if ($flg & FNAME) {	# Read but do not copy through
@@ -115,8 +121,9 @@
 	}
 
 	# Copy through the rest of the file.
-	# TODO: also normalize concatenated gzip files.  This will require reading and understanding
-	# each DEFLATE block (see RFC 1951), since gzip doesn't include lengths anywhere.
+	# TODO: also normalize concatenated gzip files.  This will require
+	# reading and understanding each DEFLATE block (see RFC 1951), since
+	# gzip doesn't include lengths anywhere.
 	while (1) {
 		my $buf;
 		my $bytes_read = read($fh, $buf, 4096);
@@ -127,7 +134,7 @@
 
 	$tempfile->close;
 	copy_data($tempfile->filename, $filename)
-		or die "$filename: unable to overwrite: copy_data: $!";
+	  or die "$filename: unable to overwrite: copy_data: $!";
 
 	return 1;
 }
diff -Nru strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/jar.pm strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/jar.pm
--- strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/jar.pm	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/jar.pm	2016-12-22 10:52:33.000000000 +0000
@@ -28,9 +28,10 @@
 use File::StripNondeterminism::handlers::javadoc;
 use File::StripNondeterminism::handlers::javaproperties;
 
-sub _jar_filename_cmp {
+sub _jar_filename_cmp($$) {
 	my ($a, $b) = @_;
-	# META-INF/ and META-INF/MANIFEST.MF are expected to be the first entries in the Zip archive.
+	# META-INF/ and META-INF/MANIFEST.MF are expected to be the first
+	# entries in the Zip archive.
 	return 0 if $a eq $b;
 	for (qw{META-INF/ META-INF/MANIFEST.MF}) {
 		return -1 if $a eq $_;
@@ -42,7 +43,8 @@
 sub _jar_normalize_manifest {
 	my ($filename) = @_;
 
-	open(my $fh, '<', $filename) or die "Unable to open $filename for reading: $!";
+	open(my $fh, '<', $filename)
+	  or die "Unable to open $filename for reading: $!";
 	my $tempfile = File::Temp->new(DIR => dirname($filename));
 
 	my $modified = 0;
@@ -60,7 +62,7 @@
 	if ($modified) {
 		$tempfile->close;
 		copy_data($tempfile->filename, $filename)
-			or die "$filename: unable to overwrite: copy_data: $!";
+		  or die "$filename: unable to overwrite: copy_data: $!";
 	}
 	return $modified;
 }
@@ -69,22 +71,28 @@
 	my ($member) = @_; # $member is a ref to an Archive::Zip::Member
 	return if $member->isDirectory();
 
-	if ($member->fileName() =~ /\.html$/ &&
-			File::StripNondeterminism::handlers::zip::peek_member($member, 1024) =~ /\<!-- Generated by javadoc/) {
+	if ($member->fileName() =~ /\.html$/
+		&&File::StripNondeterminism::handlers::zip::peek_member($member, 1024)
+		=~ /\<!-- Generated by javadoc/) {
 		# javadoc header should be within first 1kb of file
 		File::StripNondeterminism::handlers::zip::normalize_member($member,
-				\&File::StripNondeterminism::handlers::javadoc::normalize);
+			\&File::StripNondeterminism::handlers::javadoc::normalize);
 	} elsif ($member->fileName() eq 'META-INF/MANIFEST.MF') {
 		File::StripNondeterminism::handlers::zip::normalize_member($member,
-				\&_jar_normalize_manifest);
-	} elsif ($member->fileName() =~ /(pom|version)\.properties$/ &&
-		File::StripNondeterminism::handlers::javaproperties::is_java_properties_header(
-			File::StripNondeterminism::handlers::zip::peek_member($member, 1024))) {
-			# maven header should be within first 1kb of file
+			\&_jar_normalize_manifest);
+	} elsif (
+		$member->fileName() =~ /(pom|version)\.properties$/
+		&&File::StripNondeterminism::handlers::javaproperties::is_java_properties_header(
+			File::StripNondeterminism::handlers::zip::peek_member(
+				$member, 1024
+			))
+	  ) {
+		# maven header should be within first 1kb of file
 		File::StripNondeterminism::handlers::zip::normalize_member($member,
-				\&File::StripNondeterminism::handlers::javaproperties::normalize);
+			\&File::StripNondeterminism::handlers::javaproperties::normalize);
 	} elsif ($member->fileName() =~ /\.jar$/) {
-		File::StripNondeterminism::handlers::zip::normalize_member($member, \&normalize);
+		File::StripNondeterminism::handlers::zip::normalize_member($member,
+			\&normalize);
 	}
 
 	return 1;
@@ -93,16 +101,20 @@
 sub _jar_archive_filter {
 	my ($zip) = @_;
 
-	# Don't normalize signed JARs, since our modifications will break the signature.
-	# Alternatively, we could strip the signature.  However, if a JAR file is signed,
-	# it is highly likely that the JAR file was part of the source and not produced
-	# as part of the build, and therefore contains no nondeterminism.  Thus, ignoring
-	# the file makes more sense.
+	# Don't normalize signed JARs, since our modifications will break the
+	# signature.  Alternatively, we could strip the signature.  However, if
+	# a JAR file is signed, it is highly likely that the JAR file was part
+	# of the source and not produced as part of the build, and therefore
+	# contains no nondeterminism.  Thus, ignoring the file makes more
+	# sense.
+	#
+	# According to the jarsigner(1) man page, a signed JAR has a .SF file
+	# in the META-INF directory.
 	#
-	# According to the jarsigner(1) man page, a signed JAR has a .SF file in the
-	# META-INF directory.
 	if (scalar($zip->membersMatching('^META-INF/.*\.SF$')) > 0) {
-		warn "strip-nondeterminism: " . $zip->fileName() . ": ignoring signed JAR file\n";
+		warn "strip-nondeterminism: "
+		  . $zip->fileName()
+		  . ": ignoring signed JAR file\n";
 		return 0;
 	}
 
@@ -111,10 +123,12 @@
 
 sub normalize {
 	my ($jar_filename) = @_;
-	return File::StripNondeterminism::handlers::zip::normalize($jar_filename,
-							archive_filter => \&_jar_archive_filter,
-							filename_cmp => \&_jar_filename_cmp,
-							member_normalizer => \&_jar_normalize_member);
+	return File::StripNondeterminism::handlers::zip::normalize(
+		$jar_filename,
+		archive_filter => \&_jar_archive_filter,
+		filename_cmp => \&_jar_filename_cmp,
+		member_normalizer => \&_jar_normalize_member
+	);
 }
 
 1;
diff -Nru strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/javadoc.pm strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/javadoc.pm
--- strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/javadoc.pm	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/javadoc.pm	2016-12-22 10:52:33.000000000 +0000
@@ -30,34 +30,46 @@
 sub is_javadoc_file {
 	my ($filename) = @_;
 
-	# If this is a javadoc file, '<!-- Generated by javadoc' should appear in first 1kb
+	# If this is a javadoc file, '<!-- Generated by javadoc' should appear
+	# in first 1kb
 	my $fh;
 	my $str;
-	return open($fh, '<', $filename) && read($fh, $str, 1024) && $str =~ /\<!-- Generated by javadoc/;
+	return
+	     open($fh, '<', $filename)
+	  && read($fh, $str, 1024)
+	  && $str =~ /\<!-- Generated by javadoc/;
 }
 
 sub normalize {
 	my ($filename) = @_;
 
-	open(my $fh, '<', $filename) or die "Unable to open $filename for reading: $!";
+	open(my $fh, '<', $filename)
+	  or die "Unable to open $filename for reading: $!";
 	my $tempfile = File::Temp->new(DIR => dirname($filename));
 
-	# Strip the javadoc comment, which contains a timestamp.
-	# It should appear before a line containing </head>, which should be within first 15 lines.
+	# Strip the javadoc comment, which contains a timestamp. It should
+	# appear before a line containing </head>, which should be within first
+	# 15 lines.
 	my $modified = 0;
 	while (defined(my $line = <$fh>)) {
 		if ($line =~ /\<!-- Generated by javadoc .* --\>/) {
 			$line =~ s/\<!-- Generated by javadoc .* --\>//g;
-			print $tempfile $line unless $line =~ /^\s*$/; # elide lines that are now whitespace-only
+			print $tempfile $line
+			  unless $line
+			  =~ /^\s*$/; # elide lines that are now whitespace-only
 			$modified = 1;
 		} elsif ($line =~ /\<META NAME="date" CONTENT="[^"]*"\>/i) {
 			if (defined $File::StripNondeterminism::canonical_time) {
-				my $date = strftime('%Y-%m-%d', gmtime($File::StripNondeterminism::canonical_time));
-				$line =~ s/\<(META NAME="date" CONTENT)="[^"]*"\>/<$1="$date">/gi;
+				my $date = strftime('%Y-%m-%d',
+					gmtime($File::StripNondeterminism::canonical_time));
+				$line
+				  =~ s/\<(META NAME="date" CONTENT)="[^"]*"\>/<$1="$date">/gi;
 			} else {
 				$line =~ s/\<META NAME="date" CONTENT="[^"]*"\>//gi;
 			}
-			print $tempfile $line unless $line =~ /^\s*$/; # elide lines that are now whitespace-only
+			print $tempfile $line
+			  unless $line
+			  =~ /^\s*$/; # elide lines that are now whitespace-only
 			$modified = 1;
 		} elsif ($line =~ /<html lang="[^"]+">/) {
 			# Strip locale as it's inherited from environment.
@@ -83,7 +95,7 @@
 
 	$tempfile->close;
 	copy_data($tempfile->filename, $filename)
-		or die "$filename: unable to overwrite: copy_data: $!";
+	  or die "$filename: unable to overwrite: copy_data: $!";
 
 	return 1;
 }
diff -Nru strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/javaproperties.pm strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/javaproperties.pm
--- strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/javaproperties.pm	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/javaproperties.pm	2016-12-22 10:52:33.000000000 +0000
@@ -28,31 +28,38 @@
 
 sub is_java_properties_header {
 	my ($contents) = @_;
-	return $contents =~ /#Generated by( Apache)? Maven|#Build Number for ANT|#Generated by org.apache.felix.bundleplugin|#POM properties|#.* runtime configuration/;
+	return $contents
+	  =~ /#Generated by( Apache)? Maven|#Build Number for ANT|#Generated by org.apache.felix.bundleplugin|#POM properties|#.* runtime configuration/;
 }
 
 sub is_java_properties_file {
 	my ($filename) = @_;
 
-	# If this is a java properties file, '#Generated by Maven', '#Build Number for ANT',
-	# or other similar build-tool comment headers should appear in first 1kb
+	# If this is a java properties file, '#Generated by Maven', '#Build
+	# Number for ANT', or other similar build-tool comment headers should
+	# appear in first 1kb
 	my $fh;
 	my $str;
-	return open($fh, '<', $filename) && read($fh, $str, 1024)
-		&& is_java_properties_header($str);
+	return
+	     open($fh, '<', $filename)
+	  && read($fh, $str, 1024)
+	  && is_java_properties_header($str);
 }
 
 sub normalize {
 	my ($filename) = @_;
 
-	open(my $fh, '<', $filename) or die "Unable to open $filename for reading: $!";
+	open(my $fh, '<', $filename)
+	  or die "Unable to open $filename for reading: $!";
 	my $tempfile = File::Temp->new(DIR => dirname($filename));
 
-	# Strip the generation date comment, which contains a timestamp.
-	# It should appear within first 10 lines.
+	# Strip the generation date comment, which contains a timestamp.  It
+	# should appear within first 10 lines.
 	while (defined(my $line = <$fh>) && $. <= 10) {
 		# Yes, there really is no comma here
-		if ($line =~ /^#\w{3} \w{3} \d{2} \d{2}:\d{2}:\d{2} \w{3,4}([+-]\d{2}:\d{2})? \d{4}\s*$/) {
+		if ($line
+			=~ /^#\w{3} \w{3} \d{2} \d{2}:\d{2}:\d{2} \w{3,4}([+-]\d{2}:\d{2})? \d{4}\s*$/
+		  ) {
 			$line = '';
 			print $tempfile $line;
 
@@ -66,7 +73,7 @@
 
 			$tempfile->close;
 			copy_data($tempfile->filename, $filename)
-				or die "$filename: unable to overwrite: copy_data: $!";
+			  or die "$filename: unable to overwrite: copy_data: $!";
 			return 1;
 		}
 		print $tempfile $line;
diff -Nru strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/pearregistry.pm strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/pearregistry.pm
--- strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/pearregistry.pm	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/pearregistry.pm	2016-12-22 10:52:33.000000000 +0000
@@ -38,7 +38,7 @@
 	my ($filename) = @_;
 
 	open(my $fh, '<', $filename)
-		or die "Unable to open $filename for reading: $!";
+	  or die "Unable to open $filename for reading: $!";
 
 	my $modified = 0;
 	my $tempfile = File::Temp->new(DIR => dirname($filename));
@@ -46,7 +46,8 @@
 
 	while (defined(my $line = <$fh>)) {
 		# Normalize _lastmodified
-		if ($line =~ s/(?<=s:13:"_lastmodified";i:)\d+(?=;)/$canonical_time/g) {
+		if ($line =~ s/(?<=s:13:"_lastmodified";i:)\d+(?=;)/$canonical_time/g)
+		{
 			$modified = 1;
 		}
 
@@ -56,7 +57,7 @@
 	if ($modified) {
 		$tempfile->close;
 		copy_data($tempfile->filename, $filename)
-			or die "$filename: unable to overwrite: copy_data: $!";
+		  or die "$filename: unable to overwrite: copy_data: $!";
 	}
 
 	return $modified;
diff -Nru strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/png.pm strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/png.pm
--- strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/png.pm	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/png.pm	2016-12-22 10:52:33.000000000 +0000
@@ -40,7 +40,8 @@
 sub time_chunk {
 	my ($seconds) = @_;
 	my ($sec, $min, $hour, $mday, $mon, $year) = gmtime($seconds);
-	return chunk('tIME', pack('nCCCCC', 1900+$year, $mon+1, $mday, $hour, $min, $sec));
+	return chunk('tIME',
+		pack('nCCCCC', 1900+$year, $mon+1, $mday, $hour, $min, $sec));
 }
 
 sub text_chunk {
@@ -58,7 +59,7 @@
 	if (_normalize($filename, $fh, $tempfile)) {
 		$tempfile->close;
 		copy_data($tempfile->filename, $filename)
-			or die "$filename: unable to overwrite: copy_data: $!";
+		  or die "$filename: unable to overwrite: copy_data: $!";
 	}
 
 	close $fh;
@@ -75,8 +76,9 @@
 	my $modified = 0;
 	my $bytes_read;
 
-	read($fh, my $magic, 8); $magic eq "\x89PNG\r\n\x1a\n"
-		or die "$filename: does not appear to be a PNG";
+	read($fh, my $magic, 8);
+	$magic eq "\x89PNG\r\n\x1a\n"
+	  or die "$filename: does not appear to be a PNG";
 
 	print $tempfile $magic;
 
@@ -98,12 +100,17 @@
 			}
 
 			if ($type eq "tIME") {
-				print $tempfile time_chunk($canonical_time) if defined($canonical_time);
+				print $tempfile time_chunk($canonical_time)
+				  if defined($canonical_time);
 				$modified = 1;
 				next;
-			} elsif (($type =~ /[tiz]EXt/) && ($data =~ /^(date:[^\0]+|Creation Time)\0/)) {
-				print $tempfile text_chunk($1, strftime("%Y-%m-%dT%H:%M:%S-00:00",
-								gmtime($canonical_time))) if defined($canonical_time);
+			} elsif (($type =~ /[tiz]EXt/)
+				&& ($data =~ /^(date:[^\0]+|Creation Time)\0/)) {
+				print $tempfile text_chunk(
+					$1,
+					strftime(
+						"%Y-%m-%dT%H:%M:%S-00:00",gmtime($canonical_time))
+				) if defined($canonical_time);
 				$modified = 1;
 				next;
 			}
@@ -143,7 +150,7 @@
 	}
 	defined($bytes_read) or die "$filename: read failed: $!";
 	warn "$filename: $garbage bytes of garbage after IEND chunk"
-		if $garbage > 0;
+	  if $garbage > 0;
 
 	return $modified;
 }
diff -Nru strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/zip.pm strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/zip.pm
--- strip-nondeterminism-0.025/lib/File/StripNondeterminism/handlers/zip.pm	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/lib/File/StripNondeterminism/handlers/zip.pm	2016-12-22 10:52:33.000000000 +0000
@@ -34,13 +34,16 @@
 sub peek_member {
 	my ($member, $nbytes) = @_;
 	my $original_size = $member->compressedSize();
-	my $old_compression_method = $member->desiredCompressionMethod(COMPRESSION_STORED);
+	my $old_compression_method
+	  = $member->desiredCompressionMethod(COMPRESSION_STORED);
 	$member->rewindData() == AZ_OK or die "failed to rewind ZIP member";
 	my ($buffer, $status) = $member->readChunk($nbytes);
-	die "failed to read ZIP member" if $status != AZ_OK && $status != AZ_STREAM_END;
+	die "failed to read ZIP member"
+	  if $status != AZ_OK && $status != AZ_STREAM_END;
 	$member->endRead();
 	$member->desiredCompressionMethod($old_compression_method);
-	$member->{'compressedSize'} = $original_size; # Work around https://github.com/redhotpenguin/perl-Archive-Zip/issues/11
+	$member->{'compressedSize'} = $original_size
+	  ; # Work around https://github.com/redhotpenguin/perl-Archive-Zip/issues/11
 	return $$buffer;
 }
 
@@ -53,14 +56,17 @@
 	my $filename = "$tempdir/member";
 	my $original_size = $member->compressedSize();
 	$member->extractToFileNamed($filename);
-	$member->{'compressedSize'} = $original_size; # Work around https://github.com/redhotpenguin/perl-Archive-Zip/issues/11
+	$member->{'compressedSize'} = $original_size
+	  ; # Work around https://github.com/redhotpenguin/perl-Archive-Zip/issues/11
 
 	# Normalize the temporary file.
 	if ($normalizer->($filename)) {
 		# Normalizer modified the temporary file.
 		# Replace the member's contents with the temporary file's contents.
 		open(my $fh, '<', $filename) or die "Unable to open $filename: $!";
-		$member->contents(do { local $/; <$fh> });
+		$member->contents(
+			do { local $/; <$fh> }
+		);
 	}
 
 	unlink($filename);
@@ -72,6 +78,17 @@
 	CENTRAL_HEADER => 0,
 	LOCAL_HEADER => 1
 };
+
+sub unixtime_to_winnt {
+	my $unixtime = shift || 0;
+
+	# WinNT epoch is 01-Jan-1601 00:00:00 UTC
+	# diff to unix time: `date -u -d "01-Jan-1601 00:00:00 UTC" +%s`
+	my $secondsdiff = 11644473600;
+
+	return $unixtime + $secondsdiff;
+}
+
 sub normalize_extra_fields {
 	# See http://sources.debian.net/src/zip/3.0-6/proginfo/extrafld.txt for extra field documentation
 	# $header_type is CENTRAL_HEADER or LOCAL_HEADER.
@@ -91,20 +108,42 @@
 			# len determines how many timestamps this field contains
 			# this works for both the central header and local header version
 			for (my $i = 1; $i < $len; $i += 4) {
-				$result .= pack("V", $File::StripNondeterminism::canonical_time // SAFE_EPOCH);
+				$result .= pack("V",
+					$File::StripNondeterminism::canonical_time // SAFE_EPOCH);
+			}
+		} elsif ($id == 0x000a) {
+			# first 4 bytes are reserved
+			$result .= substr($field, $pos, 2+2+4);
+			my ($tag, $tagsize) = (0, 0);
+			for (my $i = 2+2+4; $i < $len; $i += $tagsize) {
+				($tag, $tagsize) = unpack("vv", substr($field, $pos + $i));
+				$result .= substr($field, $pos + $i, 2+2);
+				if ($tag == 0x0001 && $tagsize == 24) {
+					# timestamp in 1/10th microseconds
+					my $timestamp = unixtime_to_winnt($File::StripNondeterminism::canonical_time) * 10**7;
+					# mtime
+					$result .= pack("VV", $timestamp % (2**32), $timestamp / (2**32));
+					# atime
+					$result .= pack("VV", $timestamp % (2**32), $timestamp / (2**32));
+					# ctime
+					$result .= pack("VV", $timestamp % (2**32), $timestamp / (2**32));
+				} else {
+					$result .= substr($field, $pos + $i, $tagsize)
+				}
 			}
 		} elsif ($id == 0x7875) { # Info-ZIP New Unix Extra Field
 			$result .= substr($field, $pos, 4);
-			#  Version       1 byte      version of this extra field, currently 1
-			#  UIDSize       1 byte      Size of UID field
-			#  UID           Variable    UID for this entry
-			#  GIDSize       1 byte      Size of GID field
-			#  GID           Variable    GID for this entry
-			# (Same format for both central header and local header)
+		  #  Version       1 byte      version of this extra field, currently 1
+		  #  UIDSize       1 byte      Size of UID field
+		  #  UID           Variable    UID for this entry
+		  #  GIDSize       1 byte      Size of GID field
+		  #  GID           Variable    GID for this entry
+		  # (Same format for both central header and local header)
 			if (ord(substr($field, $pos + 4, 1)) == 1) {
 				my $uid_len = ord(substr($field, $pos + 5, 1));
 				my $gid_len = ord(substr($field, $pos + 6 + $uid_len, 1));
-				$result .= pack("CCx${uid_len}Cx${gid_len}", 1, $uid_len, $gid_len);
+				$result
+				  .= pack("CCx${uid_len}Cx${gid_len}", 1, $uid_len, $gid_len);
 			} else {
 				$result .= substr($field, $pos + 4, $len);
 			}
@@ -121,7 +160,8 @@
 sub try {
 	my ($sub, $errors) = @_;
 	@$errors = ();
-	my $old_error_handler = Archive::Zip::setErrorHandler(sub { push @$errors, @_ });
+	my $old_error_handler
+	  = Archive::Zip::setErrorHandler(sub { push @$errors, @_ });
 	my $res = $sub->();
 	Archive::Zip::setErrorHandler($old_error_handler);
 	return $res;
@@ -146,20 +186,28 @@
 			die "Reading ZIP archive failed: " . join("\n", @errors);
 		}
 	}
-	if (exists($options{archive_filter}) and not($options{archive_filter}->($zip))) {
+	if (exists($options{archive_filter})
+		and not($options{archive_filter}->($zip))) {
 		return 0;
 	}
 	my @filenames = sort $filename_cmp $zip->memberNames();
 	for my $filename (@filenames) {
 		my $member = $zip->removeMember($filename);
 		$zip->addMember($member);
-		$options{member_normalizer}->($member) if exists $options{member_normalizer};
-		$member->setLastModFileDateTimeFromUnix($File::StripNondeterminism::canonical_time // SAFE_EPOCH);
+		$options{member_normalizer}->($member)
+		  if exists $options{member_normalizer};
+		$member->setLastModFileDateTimeFromUnix(
+			$File::StripNondeterminism::canonical_time // SAFE_EPOCH);
 		if ($member->fileAttributeFormat() == FA_UNIX) {
-			$member->unixFileAttributes(($member->unixFileAttributes() & oct(100)) ? oct(755) : oct(644));
+			$member->unixFileAttributes(
+				($member->unixFileAttributes() & oct(100))
+				? oct(755)
+				: oct(644));
 		}
-		$member->cdExtraField(normalize_extra_fields($member->cdExtraField(), CENTRAL_HEADER));
-		$member->localExtraField(normalize_extra_fields($member->localExtraField(), LOCAL_HEADER));
+		$member->cdExtraField(
+			normalize_extra_fields($member->cdExtraField(), CENTRAL_HEADER));
+		$member->localExtraField(
+			normalize_extra_fields($member->localExtraField(), LOCAL_HEADER));
 	}
 	my $old_perms = (stat($zip_filename))[2] & oct(7777);
 	$zip->overwrite();
diff -Nru strip-nondeterminism-0.025/lib/File/StripNondeterminism.pm strip-nondeterminism-0.029/lib/File/StripNondeterminism.pm
--- strip-nondeterminism-0.025/lib/File/StripNondeterminism.pm	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/lib/File/StripNondeterminism.pm	2016-12-22 10:52:33.000000000 +0000
@@ -21,6 +21,7 @@
 use strict;
 use warnings;
 
+use POSIX qw(tzset);
 use File::StripNondeterminism::handlers::ar;
 use File::StripNondeterminism::handlers::gettext;
 use File::StripNondeterminism::handlers::gzip;
@@ -33,13 +34,18 @@
 
 our($VERSION, $canonical_time, $clamp_time);
 
-$VERSION = '0.025'; # 0.025
+$VERSION = '0.029'; # 0.029
+
+sub init {
+	$ENV{'TZ'} = 'UTC';
+	tzset();
+}
 
 sub _get_file_type {
 	my $file=shift;
-	open (FILE, '-|') # handle all filenames safely
-		|| exec('file', $file)
-		|| die "can't exec file: $!";
+	open(FILE, '-|') # handle all filenames safely
+	  || exec('file', $file)
+	  || die "can't exec file: $!";
 	my $type=<FILE>;
 	close FILE;
 	return $type;
@@ -63,15 +69,21 @@
 		return \&File::StripNondeterminism::handlers::gzip::normalize;
 	}
 	# jar
-	if (m/\.(jar|war|hpi|apk)$/ && _get_file_type($_) =~ m/(Java|Zip) archive data/) {
+	if (m/\.(jar|war|hpi|apk)$/
+		&& _get_file_type($_) =~ m/(Java|Zip) archive data/) {
 		return \&File::StripNondeterminism::handlers::jar::normalize;
 	}
 	# javadoc
-	if (m/\.html$/ && File::StripNondeterminism::handlers::javadoc::is_javadoc_file($_)) {
+	if (m/\.html$/
+		&& File::StripNondeterminism::handlers::javadoc::is_javadoc_file($_)) {
 		return \&File::StripNondeterminism::handlers::javadoc::normalize;
 	}
 	# pear registry
-	if (m/\.reg$/ && File::StripNondeterminism::handlers::pearregistry::is_registry_file($_)) {
+	if (
+		m/\.reg$/
+		&& File::StripNondeterminism::handlers::pearregistry::is_registry_file(
+			$_)
+	  ) {
 		return \&File::StripNondeterminism::handlers::pearregistry::normalize;
 	}
 	# PNG
@@ -79,11 +91,17 @@
 		return \&File::StripNondeterminism::handlers::png::normalize;
 	}
 	# pom.properties, version.properties
-	if (m/\.properties$/ && File::StripNondeterminism::handlers::javaproperties::is_java_properties_file($_)) {
-		return \&File::StripNondeterminism::handlers::javaproperties::normalize;
+	if (
+		m/\.properties$/
+		&& File::StripNondeterminism::handlers::javaproperties::is_java_properties_file(
+			$_)
+	  ) {
+		return
+		  \&File::StripNondeterminism::handlers::javaproperties::normalize;
 	}
 	# zip
-	if (m/\.(zip|pk3|epub|whl|xpi|htb|zhfst)$/ && _get_file_type($_) =~ m/Zip archive data|EPUB document/) {
+	if (m/\.(zip|pk3|epub|whl|xpi|htb|zhfst|par)$/
+		&& _get_file_type($_) =~ m/Zip archive data|EPUB document/) {
 		return \&File::StripNondeterminism::handlers::zip::normalize;
 	}
 	return undef;
@@ -92,14 +110,22 @@
 sub get_normalizer_by_name {
 	$_ = shift;
 	return \&File::StripNondeterminism::handlers::ar::normalize if $_ eq 'ar';
-	return \&File::StripNondeterminism::handlers::gettext::normalize if $_ eq 'gettext';
-	return \&File::StripNondeterminism::handlers::gzip::normalize if $_ eq 'gzip';
-	return \&File::StripNondeterminism::handlers::jar::normalize if $_ eq 'jar';
-	return \&File::StripNondeterminism::handlers::javadoc::normalize if $_ eq 'javadoc';
-	return \&File::StripNondeterminism::handlers::pearregistry::normalize if $_ eq 'pearregistry';
-	return \&File::StripNondeterminism::handlers::png::normalize if $_ eq 'png';
-	return \&File::StripNondeterminism::handlers::javaproperties::normalize if $_ eq 'javaproperties';
-	return \&File::StripNondeterminism::handlers::zip::normalize if $_ eq 'zip';
+	return \&File::StripNondeterminism::handlers::gettext::normalize
+	  if $_ eq 'gettext';
+	return \&File::StripNondeterminism::handlers::gzip::normalize
+	  if $_ eq 'gzip';
+	return \&File::StripNondeterminism::handlers::jar::normalize
+	  if $_ eq 'jar';
+	return \&File::StripNondeterminism::handlers::javadoc::normalize
+	  if $_ eq 'javadoc';
+	return \&File::StripNondeterminism::handlers::pearregistry::normalize
+	  if $_ eq 'pearregistry';
+	return \&File::StripNondeterminism::handlers::png::normalize
+	  if $_ eq 'png';
+	return \&File::StripNondeterminism::handlers::javaproperties::normalize
+	  if $_ eq 'javaproperties';
+	return \&File::StripNondeterminism::handlers::zip::normalize
+	  if $_ eq 'zip';
 	return undef;
 }
 
diff -Nru strip-nondeterminism-0.025/Makefile.PL strip-nondeterminism-0.029/Makefile.PL
--- strip-nondeterminism-0.025/Makefile.PL	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/Makefile.PL	2016-12-22 10:52:33.000000000 +0000
@@ -5,7 +5,7 @@
 my $MMVER = eval $ExtUtils::MakeMaker::VERSION;
 
 WriteMakefile(
-	NAME		=> 'strip-nondeterminism',
+	NAME		=> 'File::StripNondeterminism',
 	AUTHOR		=> 'Andrew Ayer <agwa@andrewayer.name>',
 	VERSION_FROM	=> 'lib/File/StripNondeterminism.pm',
 	ABSTRACT	=> 'tool for stripping nondeterminism from files',
diff -Nru strip-nondeterminism-0.025/.perltidyrc strip-nondeterminism-0.029/.perltidyrc
--- strip-nondeterminism-0.025/.perltidyrc	1970-01-01 00:00:00.000000000 +0000
+++ strip-nondeterminism-0.029/.perltidyrc	2016-12-22 10:52:33.000000000 +0000
@@ -0,0 +1,13 @@
+-bbao           # put line breaks before any operator
+-nbbc           # don't force blank lines before comments (bad for else blocks)
+-ce             # cuddle braces around else
+-l=79           # usually use 78, but don't want 79-long lines reformatted
+-pt=2           # don't add extra whitespace around parentheses
+-sbt=2          # ...or square brackets
+-sfs            # no space before semicolon in for (not that I use this form)
+-bar            # opening-brace-always-on-right
+-sot            # avoid lines with isolated opening tokens
+-sct            # ... same for closing tokens
+-fs             # allow "perltidy, please don't touch this" sections
+-fws            # don't add or delete whitespace
+-et=4
diff -Nru strip-nondeterminism-0.025/t/binaries.t strip-nondeterminism-0.029/t/binaries.t
--- strip-nondeterminism-0.025/t/binaries.t	1970-01-01 00:00:00.000000000 +0000
+++ strip-nondeterminism-0.029/t/binaries.t	2016-12-22 10:52:33.000000000 +0000
@@ -0,0 +1,43 @@
+#!perl
+
+#
+# Copyright 2016 Chris Lamb <lamby@debian.org>
+#
+# This file is part of strip-nondeterminism.
+#
+# strip-nondeterminism is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# strip-nondeterminism is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with strip-nondeterminism.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+use strict;
+use warnings;
+
+use Test::More;
+
+my %BINARIES = (
+	'bin/strip-nondeterminism --help' => 0,
+);
+
+if (eval{require Debian::Debhelper::Dh_Lib}) {
+	$BINARIES{'bin/dh_strip_nondeterminism --help'} = 1;
+}
+
+plan tests => scalar keys %BINARIES;
+
+foreach my $cmd (sort keys %BINARIES) {
+	my $expected = $BINARIES{$cmd};
+	system("$cmd >/dev/null 2>&1");
+	my $ret = $? >> 8;
+
+	ok($ret == $expected, "$cmd returns $ret");
+}
Binary files /tmp/tmpO9m0b1/pH_daWFcyj/strip-nondeterminism-0.025/t/fixtures/jar/jdependency.jar.in and /tmp/tmpO9m0b1/sgS7kVsZ4T/strip-nondeterminism-0.029/t/fixtures/jar/jdependency.jar.in differ
Binary files /tmp/tmpO9m0b1/pH_daWFcyj/strip-nondeterminism-0.025/t/fixtures/jar/jdependency.jar.out and /tmp/tmpO9m0b1/sgS7kVsZ4T/strip-nondeterminism-0.029/t/fixtures/jar/jdependency.jar.out differ
Binary files /tmp/tmpO9m0b1/pH_daWFcyj/strip-nondeterminism-0.025/t/fixtures/zip/test.zip.in and /tmp/tmpO9m0b1/sgS7kVsZ4T/strip-nondeterminism-0.029/t/fixtures/zip/test.zip.in differ
Binary files /tmp/tmpO9m0b1/pH_daWFcyj/strip-nondeterminism-0.025/t/fixtures/zip/test.zip.out and /tmp/tmpO9m0b1/sgS7kVsZ4T/strip-nondeterminism-0.029/t/fixtures/zip/test.zip.out differ
diff -Nru strip-nondeterminism-0.025/t/fixtures.t strip-nondeterminism-0.029/t/fixtures.t
--- strip-nondeterminism-0.025/t/fixtures.t	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/t/fixtures.t	2016-12-22 10:52:33.000000000 +0000
@@ -29,12 +29,35 @@
 use File::StripNondeterminism;
 use Test::More;
 
-my @fixtures = glob('t/fixtures/*/*.in');
+# perlfunc(1)
+my %STAT = (
+	0 => "dev (device number of filesystem)",
+	# 1 => "ino (inode number)",
+	2 => "mode (file mode (type and permissions))",
+	3 => "nlink (number of hard links to the file)",
+	4 => "uid (numeric user ID of file's owner)",
+	5 => "gid (numeric group ID of file's owner)",
+	6 => "rdev (the device identifier; special files only)",
+	# 7 => "size (total size of file, in bytes)",
+	# 8 => "atime (last access time in seconds since the epoch)",
+	# 9 => "mtime (last modified time in seconds since the epoch)",
+	# 10 => "ctime (inode change time in seconds since the epoch)",
+	11 => "blksize (preferred I/O size in bytes for interacting with the file)",
+	12 => "blocks (actual number of system-specific blocks allocated on disk)",
+);
+
+File::StripNondeterminism::init();
 
 $File::StripNondeterminism::canonical_time = 1423159771;
 
+my @fixtures = glob('t/fixtures/*/*.in');
+plan tests => scalar @fixtures;
+
 foreach my $filename (@fixtures) {
+	# Use a temporary directory per fixture so we can check whether any
+	# extraneous files are leftover.
 	my $temp = tempdir( CLEANUP => 1 );
+
 	my $in = "$temp/" . basename($filename, '.in');
 	(my $out = $filename) =~ s/\.in$/.out/;
 
@@ -48,18 +71,14 @@
 		my @stat_before = lstat $in;
 		$normalizer->($in) if defined $normalizer;
 		my @stat_after = lstat $in;
-		foreach (my $i = 0; $i < @stat_after; $i++) {
-			next if (
-				$i == 7 # size
-				|| $i == 8 # atime
-				|| $i == 9 # mtime
-				|| $i == 10 # ctime
-			);
-			is($stat_before[$i], $stat_after[$i], "$filename: stat[$i]");
-		}
 
 		ok(compare($in, $out) == 0, "Got expected output");
 
+		# Check that file attributes remain unchanged.
+		foreach my $i (sort keys %STAT) {
+			is($stat_before[$i], $stat_after[$i], "$filename: $STAT{$i}");
+		}
+
 		my @files = glob("$temp/*");
 		ok(scalar(@files) == 1, "Unexpected files leftover: " . join(" ", @files));
 
diff -Nru strip-nondeterminism-0.025/t/javaproperties.t strip-nondeterminism-0.029/t/javaproperties.t
--- strip-nondeterminism-0.025/t/javaproperties.t	2016-09-04 16:42:08.000000000 +0000
+++ strip-nondeterminism-0.029/t/javaproperties.t	2016-12-22 10:52:33.000000000 +0000
@@ -27,6 +27,8 @@
 use strict;
 use warnings;
 
+File::StripNondeterminism::init();
+
 my $dir = tempdir( CLEANUP => 1 );
 my $path;
 my $fh;