diff -u gcc-4.6-4.6.4/debian/changelog gcc-4.6-4.6.4/debian/changelog
--- gcc-4.6-4.6.4/debian/changelog
+++ gcc-4.6-4.6.4/debian/changelog
@@ -1,3 +1,12 @@
+gcc-4.6 (4.6.4-5+rpi1) jessie-staging; urgency=low
+
+  * Modified to compile code optimized for the Raspberry Pi (ARMv6+VFP).
+  * Disable testsuite
+  * Hack "distribution" to Debian for now, more recent gcc versions are getting
+    better fixes but it's not worth it for a legacy version like this.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 03 Dec 2013 22:31:30 +0000
+
 gcc-4.6 (4.6.4-5) unstable; urgency=low
 
   [ Aurelien Jarno ]
diff -u gcc-4.6-4.6.4/debian/rules.defs gcc-4.6-4.6.4/debian/rules.defs
--- gcc-4.6-4.6.4/debian/rules.defs
+++ gcc-4.6-4.6.4/debian/rules.defs
@@ -8,7 +8,7 @@
 builddir	= $(PWD)/build
 stampdir	= stamps
 
-distribution	:= $(shell lsb_release -is)
+distribution	:= Debian
 distrelease	:= $(shell lsb_release -cs)
 
 # On non official archives, "lsb_release -cs" default to "n/a". Assume
@@ -980,7 +980,7 @@
 # run testsuite ---------------
 with_check := yes
 # if you don't want to run the gcc testsuite, uncomment the next line
-#with_check := disabled by hand
+with_check := disabled by plugwash
 ifeq ($(with_base_only),yes)
   with_check := no
 endif
diff -u gcc-4.6-4.6.4/debian/rules2 gcc-4.6-4.6.4/debian/rules2
--- gcc-4.6-4.6.4/debian/rules2
+++ gcc-4.6-4.6.4/debian/rules2
@@ -354,9 +354,9 @@
     ifneq (,$(findstring gcj,$(PKGSOURCE)))
       with_arm_arch = armv6
     else
-      with_arm_arch = armv7-a
+      with_arm_arch = armv6
     endif
-    with_arm_fpu = vfpv3-d16
+    with_arm_fpu = vfp
   else
     # armel
     ifeq ($(distribution),Debian)
@@ -368,9 +368,9 @@
       ifneq (,$(findstring gcj,$(PKGSOURCE)))
         with_arm_arch = armv6
       else
-        with_arm_arch = armv7-a
+        with_arm_arch = armv6
       endif
-      with_arm_fpu = vfpv3-d16
+      with_arm_fpu = vfp
     else
       with_arm_arch = armv5t  # starting with quantal
     endif
@@ -381,7 +381,7 @@
   endif
   CONFARGS += --with-float=$(float_abi)
   ifeq ($(with_arm_thumb),yes)
-    CONFARGS += --with-mode=thumb
+    #CONFARGS += --with-mode=thumb
   endif
 endif