diff --git a/srcpkgs/gcc-fortran b/srcpkgs/gcc-fortran
new file mode 120000
index 0000000000..b08d5af579
--- /dev/null
+++ b/srcpkgs/gcc-fortran
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/srcpkgs/gcc-go b/srcpkgs/gcc-go
new file mode 120000
index 0000000000..b08d5af579
--- /dev/null
+++ b/srcpkgs/gcc-go
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/srcpkgs/gcc/gcc-fortran.template b/srcpkgs/gcc/gcc-fortran.template
new file mode 100644
index 0000000000..eb7359fceb
--- /dev/null
+++ b/srcpkgs/gcc/gcc-fortran.template
@@ -0,0 +1,37 @@
+# Template file for 'gcc-fortran'.
+#
+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 glibc
+Add_dependency run libgfortran	">=$version"
+Add_dependency run cloog-ppl
+Add_dependency run ppl
+Add_dependency run mpc
+Add_dependency run mpfr
+Add_dependency run gmp
+Add_dependency run zlib
+Add_dependency run gcc		">=$version"
+
+do_install()
+{
+	local triplet=
+
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		triplet="${xbps_machine}-unknown-linux-gnu"
+	else
+		triplet="${xbps_machine}-pc-linux-gnu"
+	fi
+
+	for f in gfortran ${triplet}-gfortran; do
+		vmove usr/bin/${f} usr/bin
+	done
+	vmove usr/libexec/gcc/${triplet}/${version}/f951 \
+		usr/libexec/gcc/${triplet}/${version}
+	vmove usr/share/info/gfortran.info usr/share/info
+	touch ${DESTDIR}/usr/share/info/dir
+	vmove usr/share/man/man1/gfortran.1 usr/share/man/man1
+}
diff --git a/srcpkgs/gcc/gcc-go.template b/srcpkgs/gcc/gcc-go.template
new file mode 100644
index 0000000000..0a74a8e0d1
--- /dev/null
+++ b/srcpkgs/gcc/gcc-go.template
@@ -0,0 +1,39 @@
+# Template file for 'gcc-go'.
+#
+short_desc="GCC Go compiler frontend"
+long_desc="${long_desc}
+
+ This package contains the GCC Go frontend."
+
+Add_dependency run libgcc	">=$version"
+Add_dependency run glibc
+Add_dependency run libstdc++	">=$version"
+Add_dependency run cloog-ppl
+Add_dependency run ppl
+Add_dependency run mpc
+Add_dependency run mpfr
+Add_dependency run gmp
+Add_dependency run zlib
+Add_dependency run gcc		">=$version"
+Add_dependency run libgo-devel	">=$version"
+
+do_install()
+{
+	local triplet=
+
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		triplet="${xbps_machine}-unknown-linux-gnu"
+	else
+		triplet="${xbps_machine}-pc-linux-gnu"
+	fi
+
+	for f in gccgo ${triplet}-gccgo; do
+		vmove usr/bin/${f} usr/bin
+	done
+	vmove usr/libexec/gcc/${triplet}/${version}/go1 \
+		usr/libexec/gcc/${triplet}/${version}
+	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/lib/go usr/lib
+}
diff --git a/srcpkgs/gcc/libgcc.template b/srcpkgs/gcc/libgcc.template
index d374c09f5f..c97e1a15df 100644
--- a/srcpkgs/gcc/libgcc.template
+++ b/srcpkgs/gcc/libgcc.template
@@ -6,10 +6,10 @@ long_desc="${long_desc}
  This package contains the GCC shared library."
 
 noverifyrdeps=yes
-replaces="gcc-libgcc>=0"
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libgcc_s.so* ${DESTDIR}/usr/lib
+	vmove "usr/lib/libgcc_s.so*" usr/lib
+	vinstall COPYING.RUNTIME 644 \
+		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 }
diff --git a/srcpkgs/gcc/libgfortran-devel.template b/srcpkgs/gcc/libgfortran-devel.template
new file mode 100644
index 0000000000..99182a1e21
--- /dev/null
+++ b/srcpkgs/gcc/libgfortran-devel.template
@@ -0,0 +1,23 @@
+# Template file for 'libgfortran-devel'.
+#
+short_desc="GCC Fortran library ${version} - development files"
+long_desc="${long_desc}
+
+ This package contains the GCC Fortran headers and static libraries."
+
+Add_dependency run libgfortran ">=${version}"
+
+do_install()
+{
+	local triplet=
+
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		triplet="${xbps_machine}-unknown-linux-gnu"
+	else
+		triplet="${xbps_machine}-pc-linux-gnu"
+	fi
+
+	vmove usr/lib/libgfortran.a usr/lib
+	vmove usr/lib/gcc/${triplet}/${version}/libgfortranbegin.a \
+		usr/lib/gcc/${triplet}/${version}
+}
diff --git a/srcpkgs/gcc/libgfortran.template b/srcpkgs/gcc/libgfortran.template
new file mode 100644
index 0000000000..4dc60d410e
--- /dev/null
+++ b/srcpkgs/gcc/libgfortran.template
@@ -0,0 +1,18 @@
+# Template file for 'libgfortran'.
+#
+short_desc="GCC Fortran library ${version} shared library support"
+long_desc="${long_desc}
+
+ This package contains the GCC Fortran shared library."
+
+Add_dependency run libgcc ">=$version"
+Add_dependency run glibc
+Add_dependency run libquadmath ">=$version"
+
+do_install()
+{
+	vmove "usr/lib/libgfortran.so*" usr/lib
+	vmove usr/lib/libgfortran.spec usr/lib
+	vinstall COPYING.RUNTIME 644 \
+		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
+}
diff --git a/srcpkgs/gcc/libgo-devel.template b/srcpkgs/gcc/libgo-devel.template
new file mode 100644
index 0000000000..23f7fd73f8
--- /dev/null
+++ b/srcpkgs/gcc/libgo-devel.template
@@ -0,0 +1,14 @@
+# Template file for 'libgo-devel'.
+#
+short_desc="GCC Go library ${version} shared library support - development files"
+long_desc="${long_desc}
+
+ This package contains the GCC Go headers and static libraries."
+
+Add_dependency run libgo ">=${version}"
+
+do_install()
+{
+	vmove usr/lib/libgo.a usr/lib
+	vmove usr/lib/libgobegin.a usr/lib
+}
diff --git a/srcpkgs/gcc/libgo.template b/srcpkgs/gcc/libgo.template
new file mode 100644
index 0000000000..53bfc90f54
--- /dev/null
+++ b/srcpkgs/gcc/libgo.template
@@ -0,0 +1,16 @@
+# Template file for 'libgo'.
+#
+short_desc="Go library ${version} shared library support"
+long_desc="${long_desc}
+
+ This package contains the GO shared library."
+
+Add_dependency run libgcc ">=${version}"
+Add_dependency run glibc
+
+do_install()
+{
+	vmove "usr/lib/libgo.so*" usr/lib
+	vinstall COPYING.RUNTIME 644 \
+		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
+}
diff --git a/srcpkgs/gcc/libgomp-devel.template b/srcpkgs/gcc/libgomp-devel.template
new file mode 100644
index 0000000000..1da084ec44
--- /dev/null
+++ b/srcpkgs/gcc/libgomp-devel.template
@@ -0,0 +1,16 @@
+# Template file for 'libgomp-devel'.
+#
+short_desc="GCC OpenMP v3.0 shared support library - development files"
+long_desc="${long_desc}
+
+ This package contains GCC OpenMP headers and static libraries
+ for OpenMP v3.0 support."
+
+Add_dependency run libgomp	">=${version}"
+
+do_install()
+{
+	vmove usr/lib/libgomp.a usr/lib
+	vmove usr/share/info/libgomp.info usr/share/info
+	touch ${DESTDIR}/usr/share/info/dir
+}
diff --git a/srcpkgs/gcc/libgomp.template b/srcpkgs/gcc/libgomp.template
index 5c7392591e..1fe965e585 100644
--- a/srcpkgs/gcc/libgomp.template
+++ b/srcpkgs/gcc/libgomp.template
@@ -6,18 +6,13 @@ long_desc="${long_desc}
  This package contains GCC shared support library which is needed
  for OpenMP v3.0 support."
 
-replaces="gcc-libgomp>=0"
-
 Add_dependency run glibc
 Add_dependency run libgcc	">=${version}"
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/share/info
-
-	mv ${SRCPKGDESTDIR}/usr/lib/libgomp.* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/info/libgomp.info \
-		${DESTDIR}/usr/share/info
-	touch ${DESTDIR}/usr/share/info/dir
+	vmove "usr/lib/libgomp*.so*" usr/lib
+	vmove usr/lib/libgomp.spec usr/lib
+	vinstall COPYING.RUNTIME 644 \
+		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 }
diff --git a/srcpkgs/gcc/libmudflap-devel.template b/srcpkgs/gcc/libmudflap-devel.template
index 2988d0f9dc..adf542e935 100644
--- a/srcpkgs/gcc/libmudflap-devel.template
+++ b/srcpkgs/gcc/libmudflap-devel.template
@@ -6,13 +6,9 @@ long_desc="${long_desc}
  This package contains GCC mudflap headers and static libraries for
  building mudflap-instrumented programs."
 
-replaces="gcc-libmudflap-devel>=0"
-
 Add_dependency run libmudflap	">=$version"
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libmudflap*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libmudflap*.so ${DESTDIR}/usr/lib
+	vmove "usr/lib/libmudflap*.a" usr/lib
 }
diff --git a/srcpkgs/gcc/libmudflap.template b/srcpkgs/gcc/libmudflap.template
index 8989eafef6..4e28228b53 100644
--- a/srcpkgs/gcc/libmudflap.template
+++ b/srcpkgs/gcc/libmudflap.template
@@ -6,13 +6,12 @@ long_desc="${long_desc}
  This package contains GCC shared support library which is needed
  for mudflap support."
 
-replaces="gcc-libmudflap>=0"
-
 Add_dependency run glibc
 Add_dependency run libgcc	">=${version}"
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libmudflap*.so.* ${DESTDIR}/usr/lib
+	vmove "usr/lib/libmudflap*.so*" usr/lib
+	vinstall COPYING.RUNTIME 644 \
+		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 }
diff --git a/srcpkgs/gcc/libobjc-devel.template b/srcpkgs/gcc/libobjc-devel.template
index ccff19560c..9befea145f 100644
--- a/srcpkgs/gcc/libobjc-devel.template
+++ b/srcpkgs/gcc/libobjc-devel.template
@@ -1,4 +1,4 @@
-# Template file for 'gcc-libobjc-devel'.
+# Template file for 'libobjc-devel'.
 #
 short_desc="GCC Objective-C shared library support (development files)"
 long_desc="${long_desc}
@@ -6,13 +6,9 @@ long_desc="${long_desc}
  This package contains GCC Objective-C headers and static libs, to
  build Objective-C programs."
 
-replaces="gcc-libobjc-devel>=0"
-
 Add_dependency run libobjc	">=$version"
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libobjc.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libobjc.so ${DESTDIR}/usr/lib
+	vmove "usr/lib/libobjc.*a" usr/lib
 }
diff --git a/srcpkgs/gcc/libobjc.template b/srcpkgs/gcc/libobjc.template
index 7e9221140d..4b72cb4d4e 100644
--- a/srcpkgs/gcc/libobjc.template
+++ b/srcpkgs/gcc/libobjc.template
@@ -1,4 +1,4 @@
-# Template file for 'gcc-libobjc'.
+# Template file for 'libobjc'.
 #
 short_desc="GCC Objective-C shared library support"
 long_desc="${long_desc}
@@ -6,13 +6,12 @@ long_desc="${long_desc}
  This package contains GCC Objective-C shared support library which is needed
  to run Objective-C dynamically linked programs."
 
-replaces="gcc-libobjc>=0"
-
 Add_dependency run glibc
 Add_dependency run libgcc	">=${version}"
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libobjc.so.* ${DESTDIR}/usr/lib
+	vmove "usr/lib/libobjc.so*" usr/lib
+	vinstall COPYING.RUNTIME 644 \
+		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 }
diff --git a/srcpkgs/gcc/libquadmath-devel.template b/srcpkgs/gcc/libquadmath-devel.template
new file mode 100644
index 0000000000..e09b2e9373
--- /dev/null
+++ b/srcpkgs/gcc/libquadmath-devel.template
@@ -0,0 +1,16 @@
+# Template file for 'libquadmath-devel'.
+#
+short_desc="GCC quadmath shared support library (development files)"
+long_desc="${long_desc}
+
+ This package contains GCC quadmath headers and static libraries for
+ building mudflap-instrumented programs."
+
+Add_dependency run libquadmath	">=$version"
+
+do_install()
+{
+	vmove "usr/lib/libquadmath*.a" usr/lib
+	vmove usr/share/info/libquadmath.info usr/share/info
+	touch ${DESTDIR}/usr/share/info/dir
+}
diff --git a/srcpkgs/gcc/libquadmath.template b/srcpkgs/gcc/libquadmath.template
new file mode 100644
index 0000000000..8ac9fabbbd
--- /dev/null
+++ b/srcpkgs/gcc/libquadmath.template
@@ -0,0 +1,16 @@
+# Template file for 'libquadmath'
+#
+short_desc="GCC quad match ${version} shared library support"
+long_desc="${long_desc}
+
+ This package contains the GCC quadmath shared library."
+
+Add_dependency run libgcc ">=$version"
+Add_dependency run glibc
+
+do_install()
+{
+	vmove "usr/lib/libquadmath.so*" usr/lib
+	vinstall COPYING.RUNTIME 644 \
+		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
+}
diff --git a/srcpkgs/gcc/libssp.template b/srcpkgs/gcc/libssp.template
index 257edcd07b..e83862e457 100644
--- a/srcpkgs/gcc/libssp.template
+++ b/srcpkgs/gcc/libssp.template
@@ -10,6 +10,7 @@ Add_dependency run glibc
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libssp.so.* ${DESTDIR}/usr/lib
+	vmove "usr/lib/libssp.so.*" usr/lib
+	vinstall COPYING.RUNTIME 644 \
+		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 }
diff --git a/srcpkgs/gcc/libstdc++-devel.template b/srcpkgs/gcc/libstdc++-devel.template
index fae2129d82..35957c9431 100644
--- a/srcpkgs/gcc/libstdc++-devel.template
+++ b/srcpkgs/gcc/libstdc++-devel.template
@@ -6,17 +6,11 @@ long_desc="${long_desc}
  This package contains GCC Header files and libraries for
  C++ development."
 
-replaces="gcc-libstdc++-devel>=0"
-
 Add_dependency run libstdc++	">=$version"
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/include
-
-	mv ${SRCPKGDESTDIR}/usr/lib/libstdc++.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libstdc++.so ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libsupc++.* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include/c++ ${DESTDIR}/usr/include
+	vmove "usr/lib/libstdc++.*a" usr/lib
+	vmove "usr/lib/libsupc++.*" usr/lib
+	vmove usr/include/c++ usr/include
 }
diff --git a/srcpkgs/gcc/libstdc++.template b/srcpkgs/gcc/libstdc++.template
index 3caf0f3d00..e5ca374b73 100644
--- a/srcpkgs/gcc/libstdc++.template
+++ b/srcpkgs/gcc/libstdc++.template
@@ -6,21 +6,17 @@ long_desc="${long_desc}
  This package contains a rewritten standard compliant GCC Standard
  C++ library."
 
-replaces="gcc-libstdc++>=0"
-
 Add_dependency run glibc
 Add_dependency run libgcc	">=${version}"
 
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/share/locale/fr/LC_MESSAGES
-	mkdir -p ${DESTDIR}/usr/share/locale/de/LC_MESSAGES
-
-	mv ${SRCPKGDESTDIR}/usr/lib/libstdc++.so.* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/locale/fr/LC_MESSAGES/libstdc++.mo \
-		${DESTDIR}/usr/share/locale/fr/LC_MESSAGES
-	mv ${SRCPKGDESTDIR}/usr/share/locale/de/LC_MESSAGES/libstdc++.mo \
-		${DESTDIR}/usr/share/locale/de/LC_MESSAGES
+	vmove "usr/lib/libstdc++.so*" usr/lib
+	vmove usr/share/locale/fr/LC_MESSAGES/libstdc++.mo \
+		usr/share/locale/fr/LC_MESSAGES
+	vmove usr/share/locale/de/LC_MESSAGES/libstdc++.mo \
+		usr/share/locale/de/LC_MESSAGES
+	vinstall COPYING.RUNTIME 644 \
+		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 }
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 5f34275d79..4925fcba79 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -2,22 +2,27 @@
 # 
 # NOTE: don't forget to sync with gcc-multilib when this package is updated.
 pkgname=gcc
-version=4.6.0
+version=4.6.1
 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
 build_style=custom-install
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=23bd0013d76ac6fb4537e5e8f4e5947129362dcc32f0d08563b7d4d9e44c0e17
+homepage="http://gcc.gnu.org"
+license="GFDL-1.2, GPL-3, LGPL-2.1"
+checksum=8eebf51c908151d1f1a3756c8899c5e71572e8469a547ad72a1ef16a08a31b59
 long_desc="
  The GNU C Compiler, with support for building C code.
  
  For C++ install gcc-c++, for ObjectiveC install gcc-objc,
- for ObjectiveC++ install gcc-objc++."
+ for ObjectiveC++ install gcc-objc++, for Go install gcc-go,
+ for Fortran install gcc-fortran."
 
 base_chroot=yes
-subpackages="libgcc libssp libssp-devel libstdc++ libstdc++-devel libgomp"
+subpackages="libgcc libgo libssp libssp-devel libstdc++ libstdc++-devel libgomp"
+subpackages="${subpackages} libquadmath libquadmath-devel libgo-devel libgomp-devel"
 subpackages="${subpackages} libmudflap libmudflap-devel libobjc libobjc-devel"
-subpackages="${subpackages} gcc-c++ gcc-objc gcc-objc++"
+subpackages="${subpackages} libgfortran libgfortran-devel gcc-fortran"
+subpackages="${subpackages} gcc-c++ gcc-objc gcc-objc++ gcc-go"
 
 Add_dependency run libgcc		">=${version}"
 Add_dependency run glibc
@@ -52,11 +57,13 @@ do_build()
 	./configure --prefix=/usr \
 		--enable-clocale=gnu --disable-bootstrap \
 		--enable-threads=posix --enable-__cxa_atexit --disable-multilib \
-		--enable-languages=c,c++,objc,obj-c++ --enable-tls \
+		--enable-languages=c,c++,objc,obj-c++,fortran,go,lto --enable-tls \
 		--with-mpfr=$XBPS_MASTERDIR/usr --with-gmp=$XBPS_MASTERDIR/usr \
 		--disable-rpath --with-system-zlib --enable-shared \
 		--with-ppl=${XBPS_MASTERDIR}/usr --with-cloog=${XBPS_MASTERDIR}/usr \
-		--enable-lto --with-libelf=${XBPS_MASTERDIR}/usr
+		--enable-lto --with-libelf=${XBPS_MASTERDIR}/usr \
+		--enable-linker-build-id --enable-gnu-unique-object \
+		--enable-checking=release
 
 	make ${makejobs}
 }
@@ -78,6 +85,10 @@ do_install()
 	cd ${DESTDIR}/lib && ln -sf ../usr/bin/cpp .
 	rm -f ${DESTDIR}/usr/lib64
 
+	# Remove libffi stuff.
+	rm -f ${DESTDIR}/usr/lib/libffi*
+	rm -f ${DESTDIR}/usr/share/man/man3/ffi*
+
 	# Remove all python scripts in libdir.
 	rm -f ${DESTDIR}/usr/lib/*.py
 
diff --git a/srcpkgs/libgfortran b/srcpkgs/libgfortran
new file mode 120000
index 0000000000..b08d5af579
--- /dev/null
+++ b/srcpkgs/libgfortran
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/srcpkgs/libgfortran-devel b/srcpkgs/libgfortran-devel
new file mode 120000
index 0000000000..b08d5af579
--- /dev/null
+++ b/srcpkgs/libgfortran-devel
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/srcpkgs/libgo b/srcpkgs/libgo
new file mode 120000
index 0000000000..b08d5af579
--- /dev/null
+++ b/srcpkgs/libgo
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/srcpkgs/libgo-devel b/srcpkgs/libgo-devel
new file mode 120000
index 0000000000..b08d5af579
--- /dev/null
+++ b/srcpkgs/libgo-devel
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/srcpkgs/libgomp-devel b/srcpkgs/libgomp-devel
new file mode 120000
index 0000000000..b08d5af579
--- /dev/null
+++ b/srcpkgs/libgomp-devel
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/srcpkgs/libquadmath b/srcpkgs/libquadmath
new file mode 120000
index 0000000000..b08d5af579
--- /dev/null
+++ b/srcpkgs/libquadmath
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/srcpkgs/libquadmath-devel b/srcpkgs/libquadmath-devel
new file mode 120000
index 0000000000..b08d5af579
--- /dev/null
+++ b/srcpkgs/libquadmath-devel
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index e36557724d..7491dfcb39 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -64,7 +64,7 @@ libmenuw.so			ncurses-libs		ncurses-devel
 libobjc.so			libobjc			libobjc-devel
 libmudflap.so			libmudflap		libmudflap-devel
 libmudflapth.so			libmudflap		libmudflap-devel
-libgomp.so			libgomp			libgomp
+libgomp.so			libgomp			libgomp-devel
 libmagic.so			file			file-devel
 libcloog.so			cloog-ppl		cloog-ppl-devel
 libbluetooth.so			libbluetooth		libbluetooth-devel
@@ -810,3 +810,6 @@ libburn.so			libburn			libburn-devel
 libgdkmm-2.4.so			gtkmm2			gtkmm2-devel
 libgtkmm-2.4.so			gtkmm2			gtkmm2-devel
 libseed-gtk3.so			libseed			libseed-devel
+libquadmath.so			libquadmath		libquadmath-devel
+libgo.so			libgo			libgo-devel
+libgfortran.so			libgfortran		libgfortran-devel