diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 00c9c82ab3..48b3e64063 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -528,15 +528,15 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
 	}
 
 	if $(HAIKU_GCC_VERSION[1]) = 4 {
-		# symlink cpp to g++'s headers
+		# symlink cpp to c++'s headers
 		AddSymlinkToHaikuHybridImage develop abi x86 gcc4 headers
-			: ../tools/current/include/g++ : cpp ;
+			: ../tools/current/include/c++ : cpp ;
 
 		# symlink to the appropriate system/lib[/gcc4] folder
 		local libs = libstdc++.so libsupc++.so ;
 		for lib in $(libs) {
 			AddSymlinkToHaikuHybridImage
-				develop abi x86 gcc4 tools gcc-4.3.3-haiku-100425 lib
+				develop abi x86 gcc4 tools gcc-4.4.4-haiku-100705 lib
 				: /system/lib $(lib) : : true ;
 		}
 	}