diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index 33900e8fb50..bf1c2e3b687 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,6 +1,7 @@
 # Template file for 'coreutils'
 pkgname=coreutils
 version=8.4
+revision=1
 distfiles="http://ftp.gnu.org/gnu/coreutils/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 configure_args="--enable-install-program=hostname --bindir=/bin"
diff --git a/srcpkgs/gcc/gcc-c++.template b/srcpkgs/gcc/gcc-c++.template
index 21a6864f1a2..15bf2e541e4 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 cloog-ppl
 Add_dependency run ppl
diff --git a/srcpkgs/gcc/gcc-objc++.template b/srcpkgs/gcc/gcc-objc++.template
index 41f8e2a012e..1c5582fd635 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 cloog-ppl
 Add_dependency run ppl
diff --git a/srcpkgs/gcc/gcc-objc.template b/srcpkgs/gcc/gcc-objc.template
index cc67158a611..21eb12c08e2 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 cloog-ppl
 Add_dependency run ppl
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index ac565eef952..f7aacc907ae 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -1,7 +1,7 @@
 # Template build file for 'gcc'
 pkgname=gcc
 version=4.4.3
-revision=1
+revision=2
 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
diff --git a/srcpkgs/mpfr/mpfr-devel.template b/srcpkgs/mpfr/mpfr-devel.template
index 68d09824717..9f878375e2e 100644
--- a/srcpkgs/mpfr/mpfr-devel.template
+++ b/srcpkgs/mpfr/mpfr-devel.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
+revision=1
+
 Add_dependency run glibc-devel
 Add_dependency run gmp-devel
 Add_dependency run mpfr
diff --git a/srcpkgs/mpfr/template b/srcpkgs/mpfr/template
index 3b457d8be8e..3cb0f2a649e 100644
--- a/srcpkgs/mpfr/template
+++ b/srcpkgs/mpfr/template
@@ -1,6 +1,7 @@
 # Template build file for 'mpfr'
 pkgname=mpfr
 version=2.4.2
+revision=1
 distfiles="http://www.mpfr.org/mpfr-current/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-thread-safe"
diff --git a/srcpkgs/ppl/ppl-devel.template b/srcpkgs/ppl/ppl-devel.template
index e4faa5de063..8fcdfa2f730 100644
--- a/srcpkgs/ppl/ppl-devel.template
+++ b/srcpkgs/ppl/ppl-devel.template
@@ -5,8 +5,10 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+Add_dependency run gmp-devel
 Add_dependency run ppl
-revision=1
+
+revision=2
 
 do_install()
 {
diff --git a/srcpkgs/ppl/template b/srcpkgs/ppl/template
index 5941134a20c..76d8d8c8b32 100644
--- a/srcpkgs/ppl/template
+++ b/srcpkgs/ppl/template
@@ -1,7 +1,7 @@
 # Template file for 'ppl'
 pkgname=ppl
 version=0.10.2
-revision=1
+revision=2
 distfiles="http://www.cs.unipr.it/ppl/Download/ftp/releases/${version}/ppl-${version}.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-rpath --enable-interfaces=c,cxx
@@ -25,7 +25,15 @@ long_desc="
  exact-arithmetic version of the simplex algorithm."
 
 base_chroot=yes
-subpackages="ppl-devel" 
-Add_dependency run	glibc
-Add_dependency run	libstdc++
-Add_dependency full	gmp		">=4.3.1_1"
+subpackages="ppl-devel"
+Add_dependency run libgcc
+Add_dependency run glibc
+Add_dependency run libstdc++
+Add_dependency run gmp
+Add_dependency build gmp-devel
+
+pre_configure()
+{
+	# 5.0.1 compatibility
+	sed -i -e "s|__GMP_BITS_PER_MP_LIMB|GMP_LIMB_BITS|g" ${wrksrc}/configure
+}