diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 6fcbcd65b6..93d6bd20b0 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -406,18 +406,21 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
 	if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
 		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 {
-			# symlink to the appropriate system/lib[/gcc2] folder
-			AddSymlinkToHaikuHybridImage
-				develop abi x86 gcc2 tools gcc-2.95.3-haiku-090629 lib
-				: /system/lib libstdc++.r4.so : : true ;
-		}
+	}
+
+	if $(HAIKU_GCC_VERSION[1]) = 2 {
+		# symlink to the appropriate system/lib[/gcc2] folder
+		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) {
 		InstallOptionalHaikuImagePackage gcc-4.3.3-r1a1-x86-gcc4-2009-06-29.zip
 			: $(baseURL)/gcc-4.3.3-r1a1-x86-gcc4-2009-06-29.zip ;
+	}
 
+	if $(HAIKU_GCC_VERSION[1]) = 4 {
 		# symlink cpp to g++'s headers
 		AddSymlinkToHaikuImage develop abi x86 gcc4 headers
 			: ../tools/current/include/g++ : cpp ;