diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index 82a6b97b5bf..8d773fc59df 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -75,16 +75,6 @@ _gcc_bootstrap() {
 	[ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
 	cd ../gcc-bootstrap
 
-	if [ ! -d ${wrksrc}/gcc-${_gcc_version}/gmp ]; then
-		mv ${wrksrc}/gmp-${_gmp_version} ${wrksrc}/gcc-${_gcc_version}/gmp
-	fi
-	if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpfr ]; then
-		mv ${wrksrc}/mpfr-${_mpfr_version} ${wrksrc}/gcc-${_gcc_version}/mpfr
-	fi
-	if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpc ]; then
-		mv ${wrksrc}/mpc-${_mpc_version} ${wrksrc}/gcc-${_gcc_version}/mpc
-	fi
- 
 	../gcc-${_gcc_version}/configure --prefix=/usr \
 		--target=${_triplet} --with-newlib \
 		--with-sysroot=${_CROSS_SYSROOT} \
@@ -116,6 +106,9 @@ _linux_headers() {
 _glibc_headers() {
 	[ -f ${wrksrc}/.glibc_headers_done ] && return 0
 
+	cd ${wrksrc}/glibc-${_glibc_version}
+	_apply_patch ${FILESDIR}/glibc-2.18-make-4.patch
+
 	cd ${wrksrc}
 	msg_normal "Building cross glibc headers\n"