diff --git a/srcpkgs/gcc-multilib/gcc-c++-multilib.flist b/srcpkgs/gcc-multilib/gcc-c++-multilib.flist
new file mode 100644
index 0000000000..e7e6b2ecac
--- /dev/null
+++ b/srcpkgs/gcc-multilib/gcc-c++-multilib.flist
@@ -0,0 +1,2 @@
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/libstdc++.a
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/libsupc++.a
diff --git a/srcpkgs/gcc-multilib/gcc-multilib.flist b/srcpkgs/gcc-multilib/gcc-multilib.flist
new file mode 100644
index 0000000000..b4fecfcbba
--- /dev/null
+++ b/srcpkgs/gcc-multilib/gcc-multilib.flist
@@ -0,0 +1,16 @@
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/libgcc_eh.a
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/libgcc.a
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/libgcov.a
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/crtbegin.o
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/crtbeginS.o
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/crtbeginT.o
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/crtend.o
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/crtendS.o
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/crtprec32.o
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/crtprec64.o
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/crtprec80.o
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/crtfastmath.o
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/libgomp.a
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/libssp.a
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/libssp_nonshared.a
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/specs
diff --git a/srcpkgs/gcc-multilib/gcc-objc++-multilib.template b/srcpkgs/gcc-multilib/gcc-objc++-multilib.template
deleted file mode 100644
index 4e5ba1cb53..0000000000
--- a/srcpkgs/gcc-multilib/gcc-objc++-multilib.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gcc-objc++-multilib'.
-#
-short_desc="The GNU Objective-C++ compiler (multilib files)"
-long_desc="
- This is the GNU Objective-C++ compiler, which compiles Objective-C on
- platforms supported by the GCC compiler.
-
- On architectures with multilib support, the package contains files and
- dependencies for the non-default multilib architecture(s)."
-
-Add_dependency run gcc-c++-multilib	">=${version}"
-Add_dependency run gcc-objc-multilib	">=${version}"
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/share/doc/${pkgname}
-}
diff --git a/srcpkgs/gcc-multilib/gcc-objc-multilib.flist b/srcpkgs/gcc-multilib/gcc-objc-multilib.flist
new file mode 100644
index 0000000000..a282f4f1ee
--- /dev/null
+++ b/srcpkgs/gcc-multilib/gcc-objc-multilib.flist
@@ -0,0 +1 @@
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6/32/libobjc.a
diff --git a/srcpkgs/gcc-multilib/libgcc32.flist b/srcpkgs/gcc-multilib/libgcc32.flist
new file mode 100644
index 0000000000..a8b0ecb9a6
--- /dev/null
+++ b/srcpkgs/gcc-multilib/libgcc32.flist
@@ -0,0 +1,2 @@
+/usr/lib32/libgcc_s.so
+/usr/lib32/libgcc_s.so.1
diff --git a/srcpkgs/gcc-multilib/libgomp32.flist b/srcpkgs/gcc-multilib/libgomp32.flist
new file mode 100644
index 0000000000..3fa2ef927c
--- /dev/null
+++ b/srcpkgs/gcc-multilib/libgomp32.flist
@@ -0,0 +1,4 @@
+/usr/lib32/libgomp.so
+/usr/lib32/libgomp.so.1
+/usr/lib32/libgomp.so.1.0.0
+/usr/lib32/libgomp.spec
diff --git a/srcpkgs/gcc-multilib/libmudflap32-devel.flist b/srcpkgs/gcc-multilib/libmudflap32-devel.flist
new file mode 100644
index 0000000000..03660471b0
--- /dev/null
+++ b/srcpkgs/gcc-multilib/libmudflap32-devel.flist
@@ -0,0 +1,2 @@
+/usr/lib32/libmudflap.a
+/usr/lib32/libmudflapth.a
diff --git a/srcpkgs/gcc-multilib/libmudflap32.flist b/srcpkgs/gcc-multilib/libmudflap32.flist
new file mode 100644
index 0000000000..39512ead2c
--- /dev/null
+++ b/srcpkgs/gcc-multilib/libmudflap32.flist
@@ -0,0 +1,6 @@
+/usr/lib32/libmudflap.so
+/usr/lib32/libmudflap.so.0
+/usr/lib32/libmudflapth.so
+/usr/lib32/libmudflapth.so.0
+/usr/lib32/libmudflap.so.0.0.0
+/usr/lib32/libmudflapth.so.0.0.0
diff --git a/srcpkgs/gcc-multilib/libobjc32.flist b/srcpkgs/gcc-multilib/libobjc32.flist
new file mode 100644
index 0000000000..55dd124452
--- /dev/null
+++ b/srcpkgs/gcc-multilib/libobjc32.flist
@@ -0,0 +1,3 @@
+/usr/lib32/libobjc.so
+/usr/lib32/libobjc.so.3
+/usr/lib32/libobjc.so.3.0.0
diff --git a/srcpkgs/gcc-multilib/libssp32.flist b/srcpkgs/gcc-multilib/libssp32.flist
new file mode 100644
index 0000000000..f8a8809dc6
--- /dev/null
+++ b/srcpkgs/gcc-multilib/libssp32.flist
@@ -0,0 +1,3 @@
+/usr/lib32/libssp.so
+/usr/lib32/libssp.so.0
+/usr/lib32/libssp.so.0.0.0
diff --git a/srcpkgs/gcc-multilib/libstdc++32-devel.flist b/srcpkgs/gcc-multilib/libstdc++32-devel.flist
new file mode 100644
index 0000000000..87406069a6
--- /dev/null
+++ b/srcpkgs/gcc-multilib/libstdc++32-devel.flist
@@ -0,0 +1,23 @@
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/ctype_base.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/ctype_inline.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/ctype_noninline.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/os_defines.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/atomic_word.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/cxxabi_tweaks.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/cpu_defines.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/error_constants.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/stdc++.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/stdtr1c++.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/extc++.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/basic_file.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/c++config.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/c++allocator.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/c++io.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/c++locale.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/messages_members.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/time_members.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/gthr.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/gthr-single.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/gthr-posix.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/gthr-tpf.h
+/usr/include/c++/4.6/x86_64-unknown-linux-gnu/32/bits/gthr-default.h
diff --git a/srcpkgs/gcc-multilib/libstdc++32.flist b/srcpkgs/gcc-multilib/libstdc++32.flist
new file mode 100644
index 0000000000..917ceb7a2e
--- /dev/null
+++ b/srcpkgs/gcc-multilib/libstdc++32.flist
@@ -0,0 +1,3 @@
+/usr/lib32/libstdc++.so
+/usr/lib32/libstdc++.so.6
+/usr/lib32/libstdc++.so.6.0.16
diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template
index c995280ee4..28f381bb19 100644
--- a/srcpkgs/gcc-multilib/template
+++ b/srcpkgs/gcc-multilib/template
@@ -1,10 +1,10 @@
 # Template build file for 'gcc-multilib'
 pkgname=gcc-multilib
 _majorver=4.6
-_gmp_ver=5.0.1
-_mpfr_ver=3.0.1
+_gmp_ver=5.0.3
+_mpfr_ver=3.1.0
 _mpc_ver=0.8.2
-version=${_majorver}.1
+version=${_majorver}.2
 wrksrc="gcc-${version}"
 distfiles="
 http://ftp.gnu.org/pub/gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2
@@ -14,9 +14,9 @@ http://www.multiprecision.org/mpc/download/mpc-${_mpc_ver}.tar.gz"
 short_desc="The GNU C Compiler suite (multilib libraries)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
-8eebf51c908151d1f1a3756c8899c5e71572e8469a547ad72a1ef16a08a31b59
-a2a610f01fd3298dc08c87bf30498c2402590e1bcb227fc40b15ee6d280939fb
-e1977099bb494319c0f0c1f85759050c418a56884e9c6cef1c540b9b13e38e7f
+60b05463dfe18d40d68fb8a71b25b408a01f86cc6ceaf5e6b22238b6b0f450c2
+dcafe9989c7f332b373e1f766af8e9cd790fc802fdec422a1910a6ef783480e3
+74a7bbbad168dd1cc414f1c9210b8fc16ccfc8e422d34b3371a8978e31eab680
 ae79f8d41d8a86456b68607e9ca398d00f8b7342d1d83bcf4428178ac45380c7"
 long_desc="
  The GNU C Compiler suite, with support for C, C++, ObjC and ObjC++.
@@ -27,7 +27,6 @@ long_desc="
 subpackages="libgcc32 libssp32 libgomp32 libobjc32 libstdc++32 libmudflap32"
 subpackages="${subpackages} libstdc++32-devel libmudflap32-devel"
 subpackages="${subpackages} gcc-c++-multilib gcc-objc-multilib"
-subpackages="${subpackages} gcc-objc++-multilib"
 
 disable_parallel_build=yes
 noverifyrdeps=yes
@@ -45,8 +44,7 @@ Add_dependency build coreutils
 Add_dependency build gawk
 Add_dependency build sed
 
-do_build()
-{
+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
@@ -59,23 +57,19 @@ do_build()
 
 	cp -a gmp/*.h ${build_wrksrc}/gmp
 
-	unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
-	local SAVEDPATH=$PATH
-	export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
-
 	./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib \
 		--enable-clocale=gnu --enable-shared --disable-bootstrap \
 		--enable-threads=posix --enable-__cxa_atexit \
 		--disable-gold --disable-lto --with-system-zlib \
 		--enable-languages=c,c++,objc,obj-c++ --disable-nls \
 		--enable-multilib
-
-	make ${makejobs}
-	export PATH=$SAVEDPATH
 }
 
-do_install()
-{
+do_build() {
+	make ${makejobs}
+}
+
+do_install() {
 	local triplet="x86_64-unknown-linux-gnu"
 	local libmddir="usr/lib/gcc/${triplet}/${_majorver}"
 	local dirn _dir_
diff --git a/srcpkgs/gcc-objc++-multilib b/srcpkgs/gcc-objc++-multilib
deleted file mode 120000
index 9f2eca37b1..0000000000
--- a/srcpkgs/gcc-objc++-multilib
+++ /dev/null
@@ -1 +0,0 @@
-gcc-multilib
\ No newline at end of file