diff -Nru klibc-2.0.4/debian/changelog klibc-2.0.4/debian/changelog
--- klibc-2.0.4/debian/changelog	2016-01-18 17:02:18.000000000 +0000
+++ klibc-2.0.4/debian/changelog	2016-01-25 01:11:26.000000000 +0000
@@ -1,3 +1,10 @@
+klibc (2.0.4-7+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 2.0.4-2+rpi1 by Peter Michael Green <plugwash@p10link.net> at Wed, 26 Nov 2014 22:01:00 +0000]
+  * Change compiler settings to values suitable for raspberry pi
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 25 Jan 2016 01:11:26 +0000
+
 klibc (2.0.4-7) unstable; urgency=medium
 
   * Drop "revert upstream nuked insmod", as nothing needs it any more
diff -Nru klibc-2.0.4/debian/rules klibc-2.0.4/debian/rules
--- klibc-2.0.4/debian/rules	2016-01-06 04:04:59.000000000 +0000
+++ klibc-2.0.4/debian/rules	2016-01-25 01:11:26.000000000 +0000
@@ -10,7 +10,7 @@
 DEB_MAKE_ENVVARS := ARCH=arm CONFIG_AEABI=y
 endif
 ifeq ($(DEB_HOST_ARCH),armhf)
-DEB_MAKE_ENVVARS := ARCH=arm CONFIG_AEABI=y CPU_ARCH=armv7-a CPU_TUNE=cortex-a8 CONFIG_KLIBC_THUMB=y
+DEB_MAKE_ENVVARS := ARCH=arm CONFIG_AEABI=y CPU_ARCH=armv6 CPU_TUNE=arm1176jzf-s CONFIG_KLIBC_THUMB=n
 endif
 ifeq ($(DEB_HOST_ARCH),ia64)
 DEB_MAKE_ENVVARS := ARCH=ia64