diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 232169caa3..7b8c1903ab 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -14,7 +14,7 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
 if $(HAIKU_GCC_VERSION[1]) >= 4 {
 	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0e-x86-gcc4-2011-09-08.zip ;
 } else {
-	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-1-x86_gcc2.hpkg ;
+	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-2-x86_gcc2.hpkg ;
 }
 
 local baseURL = http://haiku-files.org/files/optional-packages ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index c783890388..7865db5ad0 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -113,8 +113,8 @@ if [ IsOptionalHaikuImagePackageAdded APR ] {
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			apr-1.4.2-1-x86_gcc2.hpkg
-			: $(hpkgBaseURL)/apr-1.4.2-1-x86_gcc2.hpkg
+			apr-1.4.2-2-x86_gcc2.hpkg
+			: $(hpkgBaseURL)/apr-1.4.2-2-x86_gcc2.hpkg
 			: common packages ;
 	}
 }
@@ -131,8 +131,8 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			apr-util-1.3.10-1-x86_gcc2.hpkg
-			: $(hpkgBaseURL)/apr-util-1.3.10-1-x86_gcc2.hpkg
+			apr-util-1.3.10-2-x86_gcc2.hpkg
+			: $(hpkgBaseURL)/apr-util-1.3.10-2-x86_gcc2.hpkg
 			: common packages ;
 	}
 }
@@ -667,8 +667,8 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
 				: : true ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				expat-2.0.1-1-x86_gcc2.hpkg
-				: $(hpkgBaseURL)/expat-2.0.1-1-x86_gcc2.hpkg
+				expat-2.0.1-2-x86_gcc2.hpkg
+				: $(hpkgBaseURL)/expat-2.0.1-2-x86_gcc2.hpkg
 				: common packages ;
 		}
 	}
@@ -881,8 +881,8 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
 				: $(baseURL)/libiconv-1.13.1-r1a3-x86-gcc4-2011-05-24.zip ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				libiconv-1.13.1-1-x86_gcc2.hpkg
-				: $(hpkgBaseURL)/libiconv-1.13.1-1-x86_gcc2.hpkg
+				libiconv-1.13.1-2-x86_gcc2.hpkg
+				: $(hpkgBaseURL)/libiconv-1.13.1-2-x86_gcc2.hpkg
 				: common packages ;
 		}
 	}
@@ -929,8 +929,8 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
 				: $(baseURL)/libxml2-2.7.8-r1a3-x86-gcc4-2011-05-24.zip ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				libxml2-2.7.8-1-x86_gcc2.hpkg
-				: $(hpkgBaseURL)/libxml2-2.7.8-1-x86_gcc2.hpkg
+				libxml2-2.7.8-2-x86_gcc2.hpkg
+				: $(hpkgBaseURL)/libxml2-2.7.8-2-x86_gcc2.hpkg
 				: common packages ;
 		}
 	}
@@ -1061,8 +1061,8 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] {
 				: $(baseURL)/neon-0.29.6-r1a3-x86-gcc4-2011-05-24.zip ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				neon-0.29.6-1-x86_gcc2.hpkg
-				: $(hpkgBaseURL)/neon-0.29.6-1-x86_gcc2.hpkg
+				neon-0.29.6-2-x86_gcc2.hpkg
+				: $(hpkgBaseURL)/neon-0.29.6-2-x86_gcc2.hpkg
 				: common packages ;
 		}
 	}
@@ -1380,8 +1380,8 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] {
 				: $(baseURL)/sqlite-3.7.5-r1a3-x86-gcc4-2011-05-24.zip ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				sqlite3-3.7.5-1-x86_gcc2.hpkg
-				: $(hpkgBaseURL)/sqlite3-3.7.5-1-x86_gcc2.hpkg
+				sqlite-3.7.5-2-x86_gcc2.hpkg
+				: $(hpkgBaseURL)/sqlite-3.7.5-2-x86_gcc2.hpkg
 				: common packages ;
 		}
 	}
@@ -1400,8 +1400,8 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] {
 				: : true ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				subversion-1.6.15-1-x86_gcc2.hpkg
-				: $(hpkgBaseURL)/subversion-1.6.15-1-x86_gcc2.hpkg
+				subversion-1.6.15-2-x86_gcc2.hpkg
+				: $(hpkgBaseURL)/subversion-1.6.15-2-x86_gcc2.hpkg
 				: common packages ;
 		}
 	}