diff -Nru linux-tools-3.16/debian/changelog linux-tools-3.16-3.16/debian/changelog
--- linux-tools-3.16/debian/changelog	2015-02-02 22:05:59.000000000 +0000
+++ linux-tools-3.16-3.16/debian/changelog	2016-10-04 00:17:12.000000000 +0000
@@ -1,3 +1,16 @@
+linux-tools-3.16 (3.16-3+rpi2) stretch-staging; urgency=medium
+
+  * Rebuild for perl 5.14.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 04 Oct 2016 00:17:12 +0000
+
+linux-tools-3.16 (3.16-3+rpi1) stretch-staging; urgency=medium
+
+  * Disable Werror.
+  * Rename source package so this can coexist with later versions.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 04 Jan 2016 12:56:11 +0000
+
 linux-tools (3.16-3) unstable; urgency=medium
 
   * linux-tools: Fix build configuration to avoid linking perf with libbfd
diff -Nru linux-tools-3.16/debian/control linux-tools-3.16-3.16/debian/control
--- linux-tools-3.16/debian/control	2015-02-02 22:14:26.000000000 +0000
+++ linux-tools-3.16-3.16/debian/control	2016-10-04 00:17:12.000000000 +0000
@@ -1,4 +1,4 @@
-Source: linux-tools
+Source: linux-tools-3.16
 Section: kernel
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
diff -Nru linux-tools-3.16/debian/control.md5sum linux-tools-3.16-3.16/debian/control.md5sum
--- linux-tools-3.16/debian/control.md5sum	2015-02-02 22:14:26.000000000 +0000
+++ linux-tools-3.16-3.16/debian/control.md5sum	2016-10-04 00:17:12.000000000 +0000
@@ -1,4 +1,4 @@
 ac3acacf0cde6d2cc424f28241bb0857  debian/bin/gencontrol.py
-f7adbf2fbdf29c498d0d2b2e5bb92318  debian/changelog
+20f1038f750c3dbef92f1cf6349b9a21  debian/changelog
 3e0489b52c23fb258aabf6d4a0bf56b9  debian/templates/control.main.in
-c4ea113bf69d902abbc5b22211e1c378  debian/templates/control.source.in
+05d961b81151d9141323f1a30d324fa8  debian/templates/control.source.in
diff -Nru linux-tools-3.16/debian/rules linux-tools-3.16-3.16/debian/rules
--- linux-tools-3.16/debian/rules	2014-09-08 22:32:53.000000000 +0000
+++ linux-tools-3.16-3.16/debian/rules	2016-01-04 12:56:06.000000000 +0000
@@ -7,6 +7,7 @@
 VERSION_DEBIAN := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
 VERSION  := $(shell echo "$(VERSION_DEBIAN)" | sed -e 's,-[^-]*$$,,')
 VERSION_DEBIAN_BINNMU := $(shell echo "$(VERSION_DEBIAN)" | sed -ne 's,.*\+b\(.*\)$$,\1,p')
+export WERROR := 0
 
 include debian/rules.defs
 
diff -Nru linux-tools-3.16/debian/rules.gen linux-tools-3.16-3.16/debian/rules.gen
--- linux-tools-3.16/debian/rules.gen	2015-02-02 22:14:26.000000000 +0000
+++ linux-tools-3.16-3.16/debian/rules.gen	2016-10-04 00:17:12.000000000 +0000
@@ -1,5 +1,5 @@
 .NOTPARALLEL:
 binary-arch::
-	$(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='3.16' VERSION='3.16' VERSION_DEBIAN='3.16-3'
+	$(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='3.16' VERSION='3.16' VERSION_DEBIAN='3.16-3+rpi2'
 build::
-	$(MAKE) -f debian/rules.real build UPSTREAMVERSION='3.16' VERSION='3.16' VERSION_DEBIAN='3.16-3'
+	$(MAKE) -f debian/rules.real build UPSTREAMVERSION='3.16' VERSION='3.16' VERSION_DEBIAN='3.16-3+rpi2'
diff -Nru linux-tools-3.16/debian/templates/control.source.in linux-tools-3.16-3.16/debian/templates/control.source.in
--- linux-tools-3.16/debian/templates/control.source.in	2015-02-02 22:13:42.000000000 +0000
+++ linux-tools-3.16-3.16/debian/templates/control.source.in	2016-01-04 12:59:20.000000000 +0000
@@ -1,4 +1,4 @@
-Source: linux-tools
+Source: linux-tools-3.16
 Section: kernel
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>