diff --git a/danio_gcc.sh b/danio_gcc.sh
index 05ca331..dce2387 100644
--- a/danio_gcc.sh
+++ b/danio_gcc.sh
@@ -68,18 +68,9 @@ fi
 )	|| exit 1
 
 if ! (
-	(cd gcc-*; contrib/download_prerequisites)
+	(cd gcc-*; contrib/download_prerequisites; ln -svf ../newlib-${newlib_version}/newlib newlib; ln -svf ../newlib-${newlib_version}/libgloss libgloss)
 	mkdir -pv build-gcc
-	(cd build-gcc; ../gcc-*/configure --target="${TARGET}" --prefix="${PREFIX}" --disable-lto --disable-nls --disable-werror --enable-languages=all --with-pkgversion="*DANiO* T00LCHAIN" --with-system-zlib --enable-obsolete --with-newlib --with-headers="../newlib-${newlib_version}/newlib/libc/include" --enable-multilib --enable-multiarch)
-)
-then
-	echo "STAGE=${TARGET}" > .error
-	exit 1
-fi
-
-if ! (
-	make -C build-gcc -j${nproc}
-	make -C build-gcc install
+	(cd build-gcc; ../gcc-*/configure --target="${TARGET}" --prefix="${PREFIX}" --disable-lto --disable-nls --disable-werror --enable-languages=all --with-pkgversion="*DANiO* T00LCHAIN" --with-system-zlib --enable-obsolete --with-newlib --enable-multilib --enable-multiarch)
 )
 then
 	echo "STAGE=${TARGET}" > .error
@@ -87,10 +78,8 @@ then
 fi
 
 if (
-	mkdir -pv build-newlib
-	(cd build-newlib; ../newlib-*/configure --target="${TARGET}" --prefix="${PREFIX}")
-	make -C build-newlib -j${nproc}
-	make -C build-newlib install
+	make -C build-gcc -j${nproc}
+	make -C build-gcc install
 )
 then
 	find ${PREFIX} | xargs file | grep "ELF" | grep "executable" | cut -f 1 -d ":" | xargs strip -S 2>/dev/null