diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index e6bca33aee..36ebd48911 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -453,12 +453,21 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package CMake available for $(TARGET_ARCH)" ;
 	} else {
-		InstallOptionalHaikuImagePackage
-			cmake-2.8.2-x86-gcc2-2010-10-13.zip
-			: $(baseURL)/cmake-2.8.2-x86-gcc2-2010-10-13.zip
-			:
-			: true
-		;
+		if $(HAIKU_GCC_VERSION[1]) >= 4 {
+			InstallOptionalHaikuImagePackage
+				cmake-2.8.2-x86-gcc4-2010-10-31.zip
+				: $(baseURL)/cmake-2.8.2-x86-gcc4-2010-10-31.zip
+				:
+				: true
+			;
+		} else {
+			InstallOptionalHaikuImagePackage
+				cmake-2.8.2-x86-gcc2-2010-10-13.zip
+				: $(baseURL)/cmake-2.8.2-x86-gcc2-2010-10-13.zip
+				:
+				: true
+			;
+		}
 	}
 }
 
@@ -1059,11 +1068,21 @@ if [ IsOptionalHaikuImagePackageAdded Lua ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Lua available for $(TARGET_ARCH)" ;
 	} else {
-		InstallOptionalHaikuImagePackage
-			lua-5.1.4--x86-gcc2-2010-10-29.zip
-			: $(baseURL)/lua-5.1.4--x86-gcc2-2010-10-29.zip
-			:
-		;
+		if $(HAIKU_GCC_VERSION[1]) >= 4 {
+			InstallOptionalHaikuImagePackage
+				lua-5.1.4-x86-gcc4-2010-10-31.zip
+				: $(baseURL)/lua-5.1.4-x86-gcc4-2010-10-31.zip
+				:
+				: true
+			;
+		} else {
+			InstallOptionalHaikuImagePackage
+				lua-5.1.4-x86-gcc2-2010-10-29.zip
+				: $(baseURL)/lua-5.1.4-x86-gcc2-2010-10-29.zip
+				:
+				: true
+			;
+		}
 	}
 }