diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a4c0b82d5dc..8768d5f4b15 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -1,7 +1,7 @@
 # Template build file for 'gcc'
 pkgname=gcc
 version=4.4.2
-revision=3
+revision=4
 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
@@ -21,14 +21,20 @@ subpackages="libgcc libssp libssp-devel libstdc++ libstdc++-devel libgomp"
 subpackages="${subpackages} libmudflap libmudflap-devel libobjc libobjc-devel"
 subpackages="${subpackages} gcc-c++ gcc-objc gcc-objc++"
 
-Add_dependency full	gmp
-Add_dependency full	mpfr
-Add_dependency full	binutils
-Add_dependency full	cloog-ppl
-Add_dependency run	libgcc
-Add_dependency run	libgomp
-Add_dependency run	libssp-devel
-Add_dependency run	glibc-devel
+Add_dependency run gmp
+Add_dependency run mpfr
+Add_dependency run binutils
+Add_dependency run ppl
+Add_dependency run cloog-ppl
+Add_dependency run libgcc
+Add_dependency run glibc
+Add_dependency run libgomp
+Add_dependency run libssp-devel
+Add_dependency run glibc-devel
+Add_dependency build gmp-devel
+Add_dependency build mpfr-devel
+Add_dependency build binutils-devel
+Add_dependency build cloog-ppl-devel
 
 # As specified in the LFS book, disable installing libiberty.
 pre_configure()
@@ -46,10 +52,10 @@ pre_install()
 
 post_install()
 {
-	cd ${DESTDIR}/usr/bin && ln -s gcc cc
+	cd ${DESTDIR}/usr/bin && ln -sf gcc cc
 	#
 	# rpcgen wants /lib/cpp, make a symlink.
 	#
 	mkdir -p ${DESTDIR}/lib
-	cd ${DESTDIR}/lib && ln -s ../usr/bin/cpp .
+	cd ${DESTDIR}/lib && ln -sf ../usr/bin/cpp .
 }