diff --git a/srcpkgs/gcc/gcc-c++.template b/srcpkgs/gcc/gcc-c++.template
index 4475332405..531923c36a 100644
--- a/srcpkgs/gcc/gcc-c++.template
+++ b/srcpkgs/gcc/gcc-c++.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains GCC C++ support."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run cloog-ppl
@@ -12,6 +14,7 @@ Add_dependency run ppl
 Add_dependency run gmp
 Add_dependency run mpfr
 Add_dependency run mpc
+Add_dependency run libelf
 Add_dependency run gcc			">=$version"
 Add_dependency run libstdc++-devel	">=$version"
 
diff --git a/srcpkgs/gcc/gcc-objc++.template b/srcpkgs/gcc/gcc-objc++.template
index 63f8d33223..932133dec8 100644
--- a/srcpkgs/gcc/gcc-objc++.template
+++ b/srcpkgs/gcc/gcc-objc++.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains GCC Objective-C++ support."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run cloog-ppl
@@ -12,6 +14,7 @@ Add_dependency run ppl
 Add_dependency run gmp
 Add_dependency run mpfr
 Add_dependency run mpc
+Add_dependency run libelf
 Add_dependency run gcc-c++	">=$version"
 Add_dependency run gcc-objc	">=$version"
 
diff --git a/srcpkgs/gcc/gcc-objc.template b/srcpkgs/gcc/gcc-objc.template
index 9cedc8d2b3..4376c7475c 100644
--- a/srcpkgs/gcc/gcc-objc.template
+++ b/srcpkgs/gcc/gcc-objc.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains GCC Objective-C support."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run cloog-ppl
@@ -12,6 +14,7 @@ Add_dependency run ppl
 Add_dependency run gmp
 Add_dependency run mpfr
 Add_dependency run mpc
+Add_dependency run libelf
 Add_dependency run gcc		">=$version"
 Add_dependency run libobjc	">=$version"
 
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 448ab4573e..0942e8a45a 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -1,6 +1,7 @@
 # Template build file for 'gcc'
 pkgname=gcc
 version=4.5.0
+revision=1
 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-clocale=gnu --disable-bootstrap
@@ -9,7 +10,7 @@ configure_args="--enable-clocale=gnu --disable-bootstrap
 --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
---disable-gold --without-libelf --without-libelf-lib --without-libelf-includes"
+--enable-lto --with-libelf=${XBPS_MASTERDIR}/usr"
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=8293e9efa68a8ec0fdd0dae9c9bd128a8e742566acd9c8fbcfe79d98ed3756c8
@@ -34,6 +35,7 @@ Add_dependency run mpc
 Add_dependency run binutils
 Add_dependency run ppl
 Add_dependency run cloog-ppl
+Add_dependency run libelf
 Add_dependency run libssp-devel
 Add_dependency run glibc-devel
 Add_dependency build gmp-devel
@@ -41,6 +43,7 @@ Add_dependency build mpfr-devel
 Add_dependency build mpc-devel
 Add_dependency build binutils-devel
 Add_dependency build cloog-ppl-devel
+Add_dependency build libelf-devel
 
 # As specified in the LFS book, disable installing libiberty.
 pre_configure()