diff --git a/srcpkgs/gcc/patches/gcc-4.7.1-libgo-mksysinfo.patch b/srcpkgs/gcc/patches/gcc-4.7.1-libgo-mksysinfo.patch
new file mode 100644
index 0000000000..d577f10e6f
--- /dev/null
+++ b/srcpkgs/gcc/patches/gcc-4.7.1-libgo-mksysinfo.patch
@@ -0,0 +1,17 @@
+http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01946.html
+
+--- libgo/mksysinfo.sh	2012-06-29 14:23:30.684708901 +0200
++++ libgo/mksysinfo.sh	2012-06-29 14:23:20.782761973 +0200
+@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
+ # The rusage struct.
+ rusage=`grep '^type _rusage struct' gen-sysinfo.go`
+ if test "$rusage" != ""; then
+-  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
+-  rusage=`echo $rusage | sed -e 's/^ *//'`
+   # Remove anonymous unions from GNU/Linux <bits/resource.h>.
+   rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
++  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
++  rusage=`echo $rusage | sed -e 's/^ *//'`
+   nrusage=
+   while test -n "$rusage"; do
+     field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`
diff --git a/srcpkgs/gcc/patches/gcc-4.7.1-libgo-write.patch b/srcpkgs/gcc/patches/gcc-4.7.1-libgo-write.patch
index e5e8e8cef8..2260e231d1 100644
--- a/srcpkgs/gcc/patches/gcc-4.7.1-libgo-write.patch
+++ b/srcpkgs/gcc/patches/gcc-4.7.1-libgo-write.patch
@@ -1,3 +1,5 @@
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
+
 --- libgo/runtime/print.c	2012-05-26 04:22:14.000000000 +1000
 +++ libgo/runtime/print.c	2012-06-16 15:06:28.553138502 +1000
 @@ -17,7 +17,8 @@
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 5c054510e1..39a979acb5 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -2,15 +2,15 @@
 pkgname=gcc
 _majorver=4.7
 version=${_majorver}.1
-revision=2
-distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
-depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}"
+revision=3
 makedepends="perl flex zlib-devel gmp-devel mpfr-devel mpc-devel
 ppl-devel>=1.0 cloog-devel libelf-devel"
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gcc.gnu.org"
 license="GFDL-1.2, GPL-3, LGPL-2.1"
+distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
+depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}"
 checksum=16093f6fa01732adf378d97fe338f113c933bdf56da22bf87c76beff13da406f
 long_desc="
  The GNU C Compiler, with support for building C code.
@@ -72,20 +72,18 @@ do_install() {
 	# from the same series work automagically.
 	mv ${DESTDIR}/usr/lib/gcc/${_triplet}/${version} \
 		${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}
-	ln -sf /usr/lib/gcc/${_triplet}/${_majorver} \
-		${DESTDIR}/usr/lib/gcc/${_triplet}/${version}
+	cd ${DESTDIR}/usr/lib/gcc/${_triplet} && ln -sf ${_majorver} ${version}
 
 	# Ditto for c++ headers.
 	mv ${DESTDIR}/usr/include/c++/${version} \
 		${DESTDIR}/usr/include/c++/${_majorver}
-	ln -sf /usr/include/c++/${_majorver} \
-		${DESTDIR}/usr/include/c++/${version}
+	cd ${DESTDIR}/usr/include/c++ && ln -sf ${_majorver} ${version}
 
 	# cc symlink.
-	ln -sf /usr/bin/gcc ${DESTDIR}/usr/bin/cc
+	cd ${DESTDIR}/usr/bin && ln -sf gcc cc
 	# rpcgen wants /lib/cpp, make a symlink.
-	vmkdir lib
-	ln -sf /usr/bin/cpp ${DESTDIR}/lib/cpp
+	cd ${DESTDIR}/usr/lib && ln -sf ../bin/cpp .
+
 	rm -f ${DESTDIR}/usr/lib64
 
 	# Remove libffi stuff.