diff -u gcc-4.6-4.6.3/debian/rules2 gcc-4.6-4.6.3/debian/rules2
--- gcc-4.6-4.6.3/debian/rules2
+++ gcc-4.6-4.6.3/debian/rules2
@@ -348,15 +348,17 @@
     ifneq (,$(findstring gcj,$(PKGSOURCE)))
       CONFARGS += --with-arch=armv6
     else
-      CONFARGS += --with-arch=armv7-a
+      # RPI CONFARGS += --with-arch=armv7-a
+      CONFARGS += --with-arch=armv6
     endif
-    CONFARGS += --with-float=$(float_abi) --with-fpu=vfpv3-d16
+    # RPI CONFARGS += --with-float=$(float_abi) --with-fpu=vfpv3-d16
+    CONFARGS += --with-float=$(float_abi) --with-fpu=vfp
   else
     # Debian armel
     CONFARGS += --with-arch=armv4t --with-float=$(float_abi)
   endif
   ifeq ($(with_arm_thumb),yes)
-    CONFARGS += --with-mode=thumb
+    # RPI CONFARGS += --with-mode=thumb
   endif
 endif
 
diff -u gcc-4.6-4.6.3/debian/rules.patch gcc-4.6-4.6.3/debian/rules.patch
--- gcc-4.6-4.6.3/debian/rules.patch
+++ gcc-4.6-4.6.3/debian/rules.patch
@@ -297,7 +297,7 @@
 ifeq (,$(filter $(distrelease),lenny squeeze dapper hardy intrepid jaunty karmic lucid maverick))
   debian_patches += gcc-no-add-needed
 endif
-ifeq (,$(filter $(distrelease),lenny squeeze sid experimental dapper hardy intrepid jaunty karmic lucid maverick))
+ifeq (,$(filter $(distrelease),lenny squeeze wheezy sid experimental dapper hardy intrepid jaunty karmic lucid maverick))
   debian_patches += gcc-as-needed
 endif
 debian_patches += mips-fix-loongson2f-nop
diff -u gcc-4.6-4.6.3/debian/rules.defs gcc-4.6-4.6.3/debian/rules.defs
--- gcc-4.6-4.6.3/debian/rules.defs
+++ gcc-4.6-4.6.3/debian/rules.defs
@@ -993,7 +993,7 @@
 # multilib
 biarch_map := i686=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x s390x=s390 \
 		x86_64=i686 powerpc64=powerpc mips=mips64 mipsel=mips64el
-ifeq (,$(filter $(distrelease),lenny etch squeeze sid dapper hardy jaunty karmic lucid))
+ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy sid dapper hardy jaunty karmic lucid))
   biarch_map := $(subst i686=,i486=,$(biarch_map))
 endif
 ifeq ($(distribution),Ubuntu)
diff -u gcc-4.6-4.6.3/debian/changelog gcc-4.6-4.6.3/debian/changelog
--- gcc-4.6-4.6.3/debian/changelog
+++ gcc-4.6-4.6.3/debian/changelog
@@ -1,3 +1,16 @@
+gcc-4.6 (4.6.3-1.1+rpi2) wheezy; urgency=low
+
+  * Fix build scripts to recognise wheezy
+
+ -- Peter Michael Green <plugwash@p10link.net>  Sat, 28 Apr 2012 01:52:21 +0000
+
+gcc-4.6 (4.6.3-1.1+rpi) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Modified to compile code optimized for the Raspberry Pi (ARMv6+VFP).
+
+ -- Mike Thompson <mpthompson@gmail.com>  Sun, 15 Apr 2012 22:37:38 -0700
+
 gcc-4.6 (4.6.3-1) unstable; urgency=low
 
   * GCC 4.6.3 release.