diff --git a/srcpkgs/gcc/gcc-fortran.template b/srcpkgs/gcc/gcc-fortran.template
index 9525895a6e6..fe25b2fa8a7 100644
--- a/srcpkgs/gcc/gcc-fortran.template
+++ b/srcpkgs/gcc/gcc-fortran.template
@@ -5,18 +5,22 @@ long_desc="${long_desc}
 
  This package contains the GCC Fortran frontend."
 
+revision=1
+
 Add_dependency run libgcc	">=$version"
 Add_dependency run libgfortran	">=$version"
 Add_dependency run gcc		">=$version"
 
-do_install()
-{
+do_install() {
 	for f in gfortran ${_triplet}-gfortran; do
 		vmove usr/bin/${f} usr/bin
 	done
 	vmove usr/lib/gcc/${_triplet}/${_majorver}/f951 \
 		usr/lib/gcc/${_triplet}/${_majorver}
 
+	vmove usr/lib/gcc/${_triplet}/${_majorver}/finclude \
+		usr/lib/gcc/${_triplet}/${_majorver}
+
 	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/template b/srcpkgs/gcc/template
index 7f6635794c9..71a7e652479 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -2,6 +2,7 @@
 pkgname=gcc
 _majorver=4.6
 version=${_majorver}.3
+revision=1
 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -61,13 +62,10 @@ do_configure() {
 		--enable-clocale=gnu --disable-bootstrap --libdir=/usr/lib \
 		--enable-threads=posix --enable-__cxa_atexit --enable-multilib \
 		--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 \
+		--disable-rpath --with-system-zlib --enable-shared --enable-lto \
 		--enable-linker-build-id --enable-gnu-unique-object \
-		--enable-checking=release --enable-__cxa_atexit \
-		--disable-libstdcxx-pch ${CONFIGURE_SHARED_ARGS}
+		--enable-checking=release --disable-libstdcxx-pch \
+		${CONFIGURE_SHARED_ARGS}
 }
 
 do_build() {