diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 69a7a7ec0..b80a8ed54 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -16,7 +16,7 @@ noautobuild=1
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-go')
 pkgver=4.8.2
-pkgrel=1
+pkgrel=3
 #_snapshot=4.8-20130725
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
 makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen')
 checkdepends=('dejagnu' 'inetutils')
-options=('!libtool' '!emptydirs' '!distcc')
+options=('!emptydirs' '!distcc')
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
         #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
         gcc-4.8-filename-output.patch)
@@ -139,6 +139,7 @@ package_gcc()
   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
   depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog')
   groups=('base-devel')
+  options=('staticlibs')
   install=gcc.install
 
   cd ${srcdir}/gcc-build
@@ -161,6 +162,9 @@ package_gcc()
   rm -f $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
   rm -f $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
 
+  # remove static libraries - note libstdc++.a is needed for the binutils and glibc testsuite
+  rm $pkgdir/usr/lib/lib{asan,gomp,itm,mudflap{,th},quadmath}.a
+
   # many packages expect this symlink
   #install -dm755 ${pkgdir}/lib
   ln -s gcc ${pkgdir}/usr/bin/cc
@@ -208,6 +212,7 @@ package_gcc-fortran()
 {
   pkgdesc="Fortran front-end for GCC"
   depends=("gcc=$pkgver-$pkgrel")
+  options=('staticlibs' '!emptydirs')
   install=gcc-fortran.install
 
   cd ${srcdir}/gcc-build
@@ -218,12 +223,13 @@ package_gcc-fortran()
   
   ln -s gfortran ${pkgdir}/usr/bin/f95
   
-  # remove files included in gcc-libs or gcc
+  # remove files included in gcc-libs or gcc and unnneeded static lib
   rm -f ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so*
   rm -f ${pkgdir}/usr/lib/libquadmath.{a,so*}
   rm -f ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*}
   rm -f ${pkgdir}/usr/share/info/libquadmath.info
   rm -rf ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include
+  rm ${pkgdir}/usr/lib/libgfortran.a
 
   # Install Runtime Library Exception
   install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
@@ -254,12 +260,14 @@ package_gcc-go()
 {
   pkgdesc="Go front-end for GCC"
   depends=("gcc=$pkgver-$pkgrel")
+  options=('staticlibs'  '!emptydirs')
   install=gcc-go.install
 
   cd ${srcdir}/gcc-build
   make -j1 DESTDIR=$pkgdir install-target-libgo
   make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
   install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
+  rm $pkgdir/usr/lib/lib{atomic,go}.a
 
   # Install Runtime Library Exception
   install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \