diff --git a/package/base/gcc3/gcc3.conf b/package/base/gcc3/gcc3.conf
index 3e68594d7..f4c3fd8a2 100644
--- a/package/base/gcc3/gcc3.conf
+++ b/package/base/gcc3/gcc3.conf
@@ -351,13 +351,12 @@ gcc_stage0() {
 	# The options are listed in _inverse_ order here.
 	x="$base/build/$ROCKCFG_ID/root"
 	tr '\n' '@' < specs.orig | sed \
-	    -e "s|@\\*link:@|@*link:@-L /usr/$arch_target/lib |"	\
+	    -e "s|@\\*link:@|@*link:@-L $x/../tools.cross/$arch_target/lib |"	\
 	    -e "s|@\\*link:@|@*link:@-L $x/usr/$arch_target/lib |"	\
 	    -e "s|@\\*link:@|@*link:@-L $x/usr/local/lib |"		\
 	    -e "s|@\\*link:@|@*link:@-L $x/usr/lib |"			\
 	    -e "s|@\\*link:@|@*link:@-L $x/lib |"			\
 	    -e "s|@\\*link:@|@*link:@-rpath-link $x/lib |"		\
-	    -e "s|@\\*cpp:@|@*cpp:@-I /usr/$arch_target/include |"	\
 	    -e "s|@\\*cpp:@|@*cpp:@-I $x/usr/$arch_target/include |"	\
 	    -e "s|@\\*cpp:@|@*cpp:@-I $x/usr/local/include |"		\
 	    -e "s|@\\*cpp:@|@*cpp:@-I $x/usr/include |"			\