diff --git a/srcpkgs/gcc/gcc-c++.rshlibs b/srcpkgs/gcc/gcc-c++.rshlibs
index 9586e59fa0..0167f35af9 100644
--- a/srcpkgs/gcc/gcc-c++.rshlibs
+++ b/srcpkgs/gcc/gcc-c++.rshlibs
@@ -6,6 +6,3 @@ libmpfr.so.4
 libgmp.so.10
 libdl.so.2
 libz.so.1
-libppl.so.9
-libpwl.so.5
-libgmpxx.so.4
diff --git a/srcpkgs/gcc/gcc-c++.template b/srcpkgs/gcc/gcc-c++.template
index f28f6f8268..c520d98f9e 100644
--- a/srcpkgs/gcc/gcc-c++.template
+++ b/srcpkgs/gcc/gcc-c++.template
@@ -1,12 +1,11 @@
 # Template file for 'gcc-c++'.
 #
-revision=2
+revision=3
 short_desc="GCC C++ support"
 long_desc="${long_desc}
 
  This package contains GCC C++ support."
 
-
 Add_dependency run libelf
 Add_dependency run gcc			">=$version"
 Add_dependency run libstdc++-devel	">=$version"
diff --git a/srcpkgs/gcc/gcc-fortran.rshlibs b/srcpkgs/gcc/gcc-fortran.rshlibs
index 9586e59fa0..0167f35af9 100644
--- a/srcpkgs/gcc/gcc-fortran.rshlibs
+++ b/srcpkgs/gcc/gcc-fortran.rshlibs
@@ -6,6 +6,3 @@ libmpfr.so.4
 libgmp.so.10
 libdl.so.2
 libz.so.1
-libppl.so.9
-libpwl.so.5
-libgmpxx.so.4
diff --git a/srcpkgs/gcc/gcc-fortran.template b/srcpkgs/gcc/gcc-fortran.template
index 037f28827c..fc2b69c700 100644
--- a/srcpkgs/gcc/gcc-fortran.template
+++ b/srcpkgs/gcc/gcc-fortran.template
@@ -1,12 +1,11 @@
 # Template file for 'gcc-fortran'.
 #
-revision=2
+revision=3
 short_desc="GCC Fortran compiler frontend"
 long_desc="${long_desc}
 
  This package contains the GCC Fortran frontend."
 
-
 Add_dependency run libgcc	">=$version"
 Add_dependency run libgfortran	">=$version"
 Add_dependency run gcc		">=$version"
diff --git a/srcpkgs/gcc/gcc-go.rshlibs b/srcpkgs/gcc/gcc-go.rshlibs
index 49b2fd8970..4d3a7e9eae 100644
--- a/srcpkgs/gcc/gcc-go.rshlibs
+++ b/srcpkgs/gcc/gcc-go.rshlibs
@@ -9,6 +9,3 @@ libz.so.1
 libstdc++.so.6
 libm.so.6
 libgcc_s.so.1
-libppl.so.9
-libpwl.so.5
-libgmpxx.so.4
diff --git a/srcpkgs/gcc/gcc-go.template b/srcpkgs/gcc/gcc-go.template
index ec6a57c805..8a431e9c3a 100644
--- a/srcpkgs/gcc/gcc-go.template
+++ b/srcpkgs/gcc/gcc-go.template
@@ -1,12 +1,11 @@
 # Template file for 'gcc-go'.
 #
-revision=2
+revision=3
 short_desc="GCC Go compiler frontend"
 long_desc="${long_desc}
 
  This package contains the GCC Go frontend."
 
-
 Add_dependency run gcc		">=$version"
 Add_dependency run libgo-devel	">=$version"
 
@@ -20,6 +19,6 @@ do_install()
 
 	vmove usr/share/info/gccgo.info usr/share/info
 	touch ${DESTDIR}/usr/share/info/dir
-	vmove usr/share/man/man1/gccgo.1 usr/share/man
+	vmove usr/share/man/man1/gccgo.1 usr/share/man/man1
 	vmove usr/lib/go usr/lib
 }
diff --git a/srcpkgs/gcc/gcc-objc++.rshlibs b/srcpkgs/gcc/gcc-objc++.rshlibs
index effa4387d3..b94b7d6099 100644
--- a/srcpkgs/gcc/gcc-objc++.rshlibs
+++ b/srcpkgs/gcc/gcc-objc++.rshlibs
@@ -6,6 +6,3 @@ libgmp.so.10
 libdl.so.2
 libz.so.1
 libc.so.6
-libppl.so.9
-libpwl.so.5
-libgmpxx.so.4
diff --git a/srcpkgs/gcc/gcc-objc++.template b/srcpkgs/gcc/gcc-objc++.template
index bcdbeba697..0b122f2da3 100644
--- a/srcpkgs/gcc/gcc-objc++.template
+++ b/srcpkgs/gcc/gcc-objc++.template
@@ -1,6 +1,6 @@
 # Template file for 'gcc-objc++'.
 #
-revision=2
+revision=3
 short_desc="GCC Objective-C++ support"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/gcc-objc.rshlibs b/srcpkgs/gcc/gcc-objc.rshlibs
index effa4387d3..b94b7d6099 100644
--- a/srcpkgs/gcc/gcc-objc.rshlibs
+++ b/srcpkgs/gcc/gcc-objc.rshlibs
@@ -6,6 +6,3 @@ libgmp.so.10
 libdl.so.2
 libz.so.1
 libc.so.6
-libppl.so.9
-libpwl.so.5
-libgmpxx.so.4
diff --git a/srcpkgs/gcc/gcc-objc.template b/srcpkgs/gcc/gcc-objc.template
index 6d6ea9e180..4fa0e7d3f7 100644
--- a/srcpkgs/gcc/gcc-objc.template
+++ b/srcpkgs/gcc/gcc-objc.template
@@ -1,6 +1,6 @@
 # Template file for 'gcc-objc'.
 #
-revision=2
+revision=3
 short_desc="GCC Objective-C support"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/gcc.rshlibs b/srcpkgs/gcc/gcc.rshlibs
index 9586e59fa0..0167f35af9 100644
--- a/srcpkgs/gcc/gcc.rshlibs
+++ b/srcpkgs/gcc/gcc.rshlibs
@@ -6,6 +6,3 @@ libmpfr.so.4
 libgmp.so.10
 libdl.so.2
 libz.so.1
-libppl.so.9
-libpwl.so.5
-libgmpxx.so.4
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index dd81a8201e..17168baf5a 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -5,7 +5,7 @@ pkgname=gcc
 _majorver=4.6
 version=${_majorver}.2
 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
-revision=2
+revision=3
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gcc.gnu.org"
@@ -41,6 +41,7 @@ Add_dependency build libelf-devel
 Add_dependency build binutils
 
 if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
+	Add_dependency build perl ">=0"
 	Add_dependency build coreutils
 	Add_dependency build gawk
 	Add_dependency build sed
@@ -54,14 +55,7 @@ else
 	_triplet="${XBPS_MACHINE}-pc-linux-gnu"
 fi
 
-do_configure()
-{
-	if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
-		unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
-		local SAVEDPATH=$PATH
-		export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
-	fi
-
+do_configure() {
 	# As specified in the LFS book, disable installing libiberty.
 	sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
 	# Do not run fixincludes
@@ -77,17 +71,13 @@ do_configure()
 		--enable-lto --with-libelf=${XBPS_MASTERDIR}/usr \
 		--enable-linker-build-id --enable-gnu-unique-object \
 		--enable-checking=release ${CONFIGURE_SHARED_ARGS}
-
-	[ -z "$BOOTSTRAP_PKG_REBUILD" ] || export PATH=$SAVEDPATH
 }
 
-do_build()
-{
+do_build() {
 	make ${makejobs}
 }
 
-do_install()
-{
+do_install() {
 	if [ "$XBPS_MACHINE" = "x86_64" ]; then
 		vmkdir usr/lib
 		cd ${DESTDIR}/usr && ln -sf lib lib64 && cd ${wrksrc}