diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4
index 21eb6b5404..6eae4c87ea 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -114,15 +114,17 @@ mkdir -p $installDir/lib/gcc/$haikuMachine/$gccVersion
 
 if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
 	cloogSourceDir=$buildToolsDir/cloog
+	gmpSourceDir=$buildToolsDir/gcc/gmp
 	pplSourceDir=$buildToolsDir/ppl
 
 	pplObjDir=$objDir/ppl
+	gmpObjDir=$objDir/gmp
 	cloogObjDir=$objDir/cloog
-	mkdir -p $pplObjDir $cloogObjDir || exit 1
+	mkdir -p $pplObjDir $gmpObjDir $cloogObjDir || exit 1
 	
 	gccConfigureArgs="$gccConfigureArgs --with-cloog=$installDir \
 		--enable-cloog-backend=isl --with-ppl=$installDir \
-		--disable-cloog-version-check"
+		--disable-cloog-version-check --with-gmp=$installDir"
 fi
 
 # force the POSIX locale, as the build (makeinfo) might choke otherwise
@@ -139,6 +141,13 @@ $MAKE $additionalMakeArgs install || exit 1
 export PATH=$PATH:$installDir/bin
 
 if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
+	# build gmp
+	cd $gmpObjDir
+	$gmpSourceDir/configure --prefix=$installDir \
+		--disable-shared --enable-cxx || exit 1
+	$MAKE $additionalMakeArgs || exit 1
+	$MAKE $additionalMakeArgs install || exit 1
+	
 	# build ppl
 	cd $pplObjDir
 	CFLAGS="-O2" CXXFLAGS="-O2" $pplSourceDir/configure --prefix=$installDir \
@@ -150,7 +159,8 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
 	# build cloog
 	cd $cloogObjDir
 	CFLAGS="-O2" CXXFLAGS="-O2" $cloogSourceDir/configure \
-		--prefix=$installDir --disable-nls --disable-shared || exit 1
+		--prefix=$installDir --disable-nls --disable-shared \
+		--with-gmp-prefix=$installDir || exit 1
 	$MAKE $additionalMakeArgs || exit 1
 	$MAKE $additionalMakeArgs install || exit 1
 fi