diff --git a/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe b/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe
index b9f78b7f0..2e0d0f70b 100644
--- a/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe
@@ -7,8 +7,8 @@ LICENSE="
 	"
 COPYRIGHT="1988-2000 Free Software Foundation, Inc."
 SRC_URI="
-	git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c
-	git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c
+	git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#6ff546f23b0259bcd27550aa6ad8aaef89fd1bf6
+	git+git://github.com/haiku/BuildtoolsPM.git#6ff546f23b0259bcd27550aa6ad8aaef89fd1bf6
 	"
 REVISION="2"
 ARCHITECTURES="x86_gcc2"
@@ -123,7 +123,7 @@ INSTALL()
 	# make all tools available via default paths
 	echo "Symlinking binaries into default path"
 	mkdir -p $binDir
-	symlinkRelative -s $installDir/bin/* $binDir
+	symlinkRelative -s $gccInstallDir/bin/* $binDir
 
 	### Strip #################################################
 
@@ -150,5 +150,5 @@ INSTALL()
 	rm -rf $gccInstallDir/include/g++
 	ln -snf /boot/system/develop/headers/c++/2.95.3 $gccInstallDir/include/g++
 
-	ln -snf /boot/system/lib/libstdc++.r4.so $gccInstallDir/lib/
+	ln -snf /boot/system/lib$secondaryArchSubDir/libstdc++.r4.so $gccInstallDir/lib/
 }