diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 57c217188b..db2fc7e8c8 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -839,7 +839,7 @@ if $(TARGET_ARCH) != x86 {
 	Echo "Libsolv not available for $(TARGET_ARCH)." ;
 } else if $(HAIKU_GCC_VERSION[1]) = 2 {
 	HAIKU_LIBSOLV_PACKAGE
-		= libsolv-0.3.0_haiku_2013_04_18-2-x86_gcc2.hpkg ;
+		= libsolv-0.3.0_haiku_2013_05_20-1-x86_gcc2.hpkg ;
 } else {
 	Echo "Libsolv not available for gcc4." ;
 }
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index c01d3ad0fc..44425b3299 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -504,7 +504,7 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] {
 				: : cdPackage ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				$(hpkgBaseURL)/cmake-2.8.5-3-x86_gcc2.hpkg ;
+				$(hpkgBaseURL)/cmake-2.8.5-4-x86_gcc2.hpkg ;
 		}
 	}
 }