diff -Nru iceweasel-38.6.1esr/debian/changelog iceweasel-38.6.1esr/debian/changelog
--- iceweasel-38.6.1esr/debian/changelog	2016-02-14 07:27:07.000000000 +0000
+++ iceweasel-38.6.1esr/debian/changelog	2016-02-17 23:58:43.000000000 +0000
@@ -1,3 +1,11 @@
+iceweasel (38.6.1esr-1~deb7u1+rpi1) wheezy-staging; urgency=medium
+
+  [changes brought forward from 31.5.3esr-1~deb7u1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 25 Mar 2015 00:00:46 +0000]
+  * Build with gcc 4.7 to avoid ICE
+  * Fix clean target
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 17 Feb 2016 23:58:42 +0000
+
 iceweasel (38.6.1esr-1~deb7u1) oldstable-security; urgency=medium
 
   * New upstream release.
diff -Nru iceweasel-38.6.1esr/debian/control iceweasel-38.6.1esr/debian/control
--- iceweasel-38.6.1esr/debian/control	2016-02-14 08:09:33.000000000 +0000
+++ iceweasel-38.6.1esr/debian/control	2016-02-18 01:13:14.000000000 +0000
@@ -48,7 +48,9 @@
                imagemagick,
                librsvg2-bin,
                xsltproc,
-               iso-codes
+               iso-codes,
+               gcc-4.7,
+               g++-4.7
 Build-Conflicts: graphicsmagick-imagemagick-compat,
                  liboss4-salsa-dev,
                  libhildonmime-dev,
diff -Nru iceweasel-38.6.1esr/debian/control.in iceweasel-38.6.1esr/debian/control.in
--- iceweasel-38.6.1esr/debian/control.in	2016-02-14 06:56:42.000000000 +0000
+++ iceweasel-38.6.1esr/debian/control.in	2016-02-17 23:58:43.000000000 +0000
@@ -64,7 +64,9 @@
                imagemagick,
                librsvg2-bin,
                xsltproc,
-               iso-codes
+               iso-codes,
+               gcc-4.7,
+               g++-4.7
 Build-Conflicts: graphicsmagick-imagemagick-compat,
                  liboss4-salsa-dev,
                  libhildonmime-dev,
diff -Nru iceweasel-38.6.1esr/debian/rules iceweasel-38.6.1esr/debian/rules
--- iceweasel-38.6.1esr/debian/rules	2016-02-14 06:56:42.000000000 +0000
+++ iceweasel-38.6.1esr/debian/rules	2016-02-17 23:58:43.000000000 +0000
@@ -119,12 +119,12 @@
 	GENSYMBOLS_FLAGS := -c4
 endif
 
-ifeq (default,$(origin CC))
-CC := gcc
-endif
-ifeq (default,$(origin CXX))
-CXX := g++
-endif
+#ifeq (default,$(origin CC))
+CC := gcc-4.7
+#endif
+#ifeq (default,$(origin CXX))
+CXX := g++-4.7
+#endif 
 
 CXXFLAGS = $(CFLAGS)
 
@@ -280,6 +280,9 @@
 			sed -i '2!b;/^exec "/ d' $$dir/$$file; \
 		done; \
 	done
+	rm -rf build-*
+	rm -rf python/psutil/build
+	rm -f python/psutil/*.so
 
 override_dh_auto_install: stamps/install-$(PRODUCT)