diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index c289e3428d..5b6e2a311f 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -404,8 +404,13 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
 		&& $(TARGET_ARCH) = x86 {
 	# gcc and binutils
 	if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
-		InstallOptionalHaikuImagePackage gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip
-			: $(baseURL)/gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip ;
+		InstallOptionalHaikuImagePackage gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip
+			: $(baseURL)/gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip ;
+		if $(HAIKU_GCC_VERSION[1]) = 2 {
+			AddSymlinkToHaikuHybridImage
+				develop abi x86 gcc2 tools gcc-2.95.3-haiku-090629 lib
+				: /system/lib libstdc++.r4.so : : true ;
+		}
 	}
 
 	if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {