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-01-04 12:58:48.000000000 +0000
@@ -1,3 +1,10 @@
+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-01-04 12:59:35.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/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/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>