diff --git a/sys-devel/gcc/gcc-2.95.3_130425.recipe b/sys-devel/gcc/gcc-2.95.3_130425.recipe
index dea97fe49..fa559fb61 100644
--- a/sys-devel/gcc/gcc-2.95.3_130425.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_130425.recipe
@@ -10,16 +10,19 @@ SRC_URI="
 	git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045
 	git+git://github.com/haiku/BuildtoolsPM.git#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045
 	"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
 	gcc = $portVersion compat >= 2.95.3
+	cmd:cc
 	cmd:c++ = $portVersion compat >= 2.95.3
+	cmd:c++filt = $portVersion compat >= 2.95.3
 	cmd:cpp = $portVersion compat >= 2.95.3
 	cmd:g++ = $portVersion compat >= 2.95.3
 	cmd:gcc = $portVersion compat >= 2.95.3
 	cmd:gcov = 1.5 compat >= 1.5
+	cmd:i586_pc_haiku_gcc = $portVersion compat >= 2.95.3
 	cmd:protoize = $portVersion compat >= 2.95.3
 	cmd:unprotoize = $portVersion compat >= 2.95.3
 	"
@@ -42,18 +45,19 @@ BUILD_PREREQUIRES="
 	"
 
 SOURCE_DIR="$portVersionedName"
+SOURCE_EXPORT_SUBDIR="legacy/gcc"
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 
 gccDir=$(pwd)/legacy/gcc
-gccDate=110711
-relativeGccInstallDir="develop/tools/gcc-2.95.3-${gccDate}"
+gccDate=$(echo $portVersion | sed 's,.*_,,')
+relativeGccInstallDir="develop/tools/gcc-2.95.3_${gccDate}"
 gccInstallDir="$prefix/$relativeGccInstallDir"
-objectsDir=$(pwd)/../${portVersionedName}-obj
-gccObjectsDir=$objectsDir/gcc
+gccObjectsDir=$gccDir/../gcc-obj
+gccDocDir=$docDir-2.95.3
 
 BUILD()
 {
-	rm -rf $objectsDir
+	rm -rf $gccObjectsDir
 
 	# Touch some files generated by bison, so that bison won't run to update
 	# them. Fixes issues with newer bison versions.
@@ -78,11 +82,14 @@ INSTALL()
 	cd $gccObjectsDir
 	make install 
 
+	rm $gccInstallDir/lib/libiberty.a
+		# only needed for building gcc
+
 	base=$gccInstallDir
 
 	### HTML documentation ####################################
 	
-	html_base=$prefix/documentation/packages/$portVersionedName
+	html_base=$gccDocDir
 	if [ ! -d "$html_base" ]; then
 		echo "Building HTML documentation..."
 		mkdir -p $html_base
@@ -111,7 +118,7 @@ INSTALL()
 	
 	# make all tools available via default paths if this is the system 
 	# compiler
-	if [ $architecture = 'x86_gcc2' ]; then
+	if [ $targetArchitecture = 'x86_gcc2' ]; then
 		echo "Symlinking binaries into default path"
 		mkdir -p $prefix/bin
 		cd $prefix/bin