diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 789c4e908e..dc4da0a0cb 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -12,9 +12,9 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
 }
 
 if $(HAIKU_GCC_VERSION[1]) >= 4 {
-	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0e-x86-gcc4-2011-09-08.zip ;
+	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-x86-gcc4-2012-06-01.zip ;
 } else {
-	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0e-x86-gcc2-2011-09-09.zip ;
+	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-x86-gcc2-2012-06-15.zip ;
 }
 
 local baseURL = http://haiku-files.org/files/optional-packages ;
@@ -339,9 +339,9 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
 	if $(TARGET_ARCH) = ppc {
 		HAIKU_FREETYPE_FILE = freetype-2.4.6-ppc-gcc4-2012-03-17.zip ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		HAIKU_FREETYPE_FILE = freetype-2.4.6-x86-gcc4-2012-03-15.zip ;
+		HAIKU_FREETYPE_FILE = freetype-2.4.9-x86-gcc4-2012-06-15.zip ;
 	} else {
-		HAIKU_FREETYPE_FILE = freetype-2.4.6-x86-gcc2-2012-03-15.zip ;
+		HAIKU_FREETYPE_FILE = freetype-2.4.9-x86-gcc2-2012-06-15.zip ;
 	}
 
 	local freetypeZipFile = [ DownloadFile $(HAIKU_FREETYPE_FILE)
@@ -361,7 +361,7 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
 		: extracted-freetype ] ;
 	HAIKU_FREETYPE_CURRENT_LIB = [ ExtractArchive $(HAIKU_FREETYPE_DIR)
 		:
-		common/lib/libfreetype.so.6.7.1
+		common/lib/libfreetype.so.6.8.1
 		: $(freetypeZipFile)
 		: extracted-freetype ] ;
 	Depends $(HAIKU_FREETYPE_LIB) $(HAIKU_FREETYPE_CURRENT_LIB) : $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
@@ -385,7 +385,7 @@ if [ IsOptionalHaikuImagePackageAdded TagLib ] {
 }
 
 local baseURL = http://haiku-files.org/files/optional-packages ;
-HAIKU_TAGLIB_PACKAGE = taglib-1.6.3-r1a2-x86-gcc2-2010-04-25.zip ;
+HAIKU_TAGLIB_PACKAGE = taglib-1.7.2-x86-gcc2-2012-06-15.zip ;
 HAIKU_TAGLIB_URL = $(baseURL)/$(HAIKU_TAGLIB_PACKAGE) ;
 
 if $(HAIKU_BUILD_FEATURE_TAGLIB) {
diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages
index 82042787c3..941fee38ff 100644
--- a/build/jam/OptionalLibPackages
+++ b/build/jam/OptionalLibPackages
@@ -227,41 +227,41 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
 		Echo "No optional package SDLLibs available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			libsdl-1.2-hg-r1a3-x86-gcc4-2011-05-29.zip
-			: $(baseURL)/lib/libsdl-1.2-hg-r1a3-x86-gcc4-2011-05-29.zip ;
+			libsdl-1.2.15-x86-gcc4-2012-05-31.zip
+			: $(baseURL)/lib/libsdl-1.2.15-x86-gcc4-2012-05-31.zip ;
 		InstallOptionalHaikuImagePackage
-			guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip ;
+			guilib-1.2.1-x86-gcc4-2012-05-31.zip
+			: $(baseURL)/lib/guilib-1.2.1-x86-gcc4-2012-05-31.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-gfx-2.0.22-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/sdl-gfx-2.0.22-r1a3-x86-gcc4-2011-05-26.zip ;
+			sdl-gfx-2.0.23-x86-gcc4-2011-05-31.zip
+			: $(baseURL)/lib/sdl-gfx-2.0.23-x86-gcc4-2012-05-31.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-image-1.2.10-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/sdl-image-1.2.10-r1a3-x86-gcc4-2011-05-26.zip ;
+			sdl-image-1.2.12-x86-gcc4-2012-05-31.zip
+			: $(baseURL)/lib/sdl-image-1.2.12-x86-gcc4-2011-05-31.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-mixer-1.2.11-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/sdl-mixer-1.2.11-r1a3-x86-gcc4-2011-05-26.zip ;
+			sdl-mixer-1.2.11-x86-gcc4-2012-05-31.zip
+			: $(baseURL)/lib/sdl-mixer-1.2.11-x86-gcc4-2012-05-31.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-net-1.2.7-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/sdl-net-1.2.7-r1a3-x86-gcc4-2011-05-26.zip ;
+			sdl-net-1.2.8-x86-gcc4-2012-05-31.zip
+			: $(baseURL)/lib/sdl-net-1.2.8-x86-gcc4-2012-05-31.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-sound-1.0.3-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/sdl-sound-1.0.3-r1a3-x86-gcc4-2011-05-26.zip ;
+			sdl-sound-1.0.3-x86-gcc4-2012-05-31.zip
+			: $(baseURL)/lib/sdl-sound-1.0.3-x86-gcc4-2012-05-31.zip ;
 		InstallOptionalHaikuImagePackage
 			sdl-rtf-0.1.0-r1a3-x86-gcc4-2011-05-26.zip
 			: $(baseURL)/lib/sdl-rtf-0.1.0-r1a3-x86-gcc4-2011-05-26.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-ttf-2.0.10-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/sdl-ttf-2.0.10-r1a3-x86-gcc4-2011-05-26.zip ;
+			sdl-ttf-2.0.11-x86-gcc4-2012-05-31.zip
+			: $(baseURL)/lib/sdl-ttf-2.0.11-x86-gcc4-2012-05-31.zip ;
 		InstallOptionalHaikuImagePackage
-			sge-030809-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/sge-030809-r1a3-x86-gcc4-2011-05-26.zip ;
+			sge-030809-x86-gcc4-2012-05-31.zip
+			: $(baseURL)/lib/sge-030809-x86-gcc4-2012-05-31.zip ;
 		InstallOptionalHaikuImagePackage
-			smjpeg-0.2.1-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/smjpeg-0.2.1-r1a3-x86-gcc4-2011-05-26.zip ;
+			smjpeg-0.2.1-x86-gcc4-2012-05-31.zip
+			: $(baseURL)/lib/smjpeg-0.2.1-x86-gcc4-2012-05-31.zip ;
 		InstallOptionalHaikuImagePackage
-			smpeg-0.4.5-r1a3-x86-gcc4-2011-05-26.zip
-			: $(baseURL)/lib/smpeg-0.4.5-r1a3-x86-gcc4-2011-05-26.zip ;
+			smpeg-0.4.5-x86-gcc4-2011-05-31.zip
+			: $(baseURL)/lib/smpeg-0.4.5-x86-gcc4-2012-05-31.zip ;
 	} else {
 		InstallOptionalHaikuImagePackage
 			libsdl-1.2-hg-r1a3-x86-gcc2-2011-05-29.zip
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 533fd73bcb..8737a0f92d 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -532,11 +532,11 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Curl available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		InstallOptionalHaikuImagePackage curl-7.21.7-x86-gcc4-2012-02-18.zip
-			: $(baseURL)/curl-7.21.7-x86-gcc4-2012-02-18.zip ;
+		InstallOptionalHaikuImagePackage curl-7.26.0-x86-gcc4-2012-06-15.zip
+			: $(baseURL)/curl-7.26.0-x86-gcc4-2012-06-15.zip ;
 	} else {
-		InstallOptionalHaikuImagePackage curl-7.21.7-x86-gcc2-2012-02-18.zip
-			: $(baseURL)/curl-7.21.7-x86-gcc2-2012-02-18.zip ;
+		InstallOptionalHaikuImagePackage curl-7.26.0-x86-gcc2-2012-06-15.zip
+			: $(baseURL)/curl-7.26.0-x86-gcc2-2012-06-15.zip ;
 	}
 }
 
@@ -1185,12 +1185,12 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
-				libxml2-2.7.8-r1a3-x86-gcc4-2011-05-24.zip
-				: $(baseURL)/libxml2-2.7.8-r1a3-x86-gcc4-2011-05-24.zip ;
+				libxml2-2.8.0-x86-gcc4-2012-06-15.zip
+				: $(baseURL)/libxml2-2.8.0-x86-gcc4-2012-06-15.zip ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				libxml2-2.7.8-r1a3-x86-gcc2-2011-05-18.zip
-				: $(baseURL)/libxml2-2.7.8-r1a3-x86-gcc2-2011-05-18.zip ;
+				libxml2-2.8.0-x86-gcc2-2012-06-15.zip
+				: $(baseURL)/libxml2-2.8.0-x86-gcc2-2012-06-15.zip ;
 		}
 	}
 }
@@ -1277,13 +1277,13 @@ if [ IsOptionalHaikuImagePackageAdded Mercurial ] {
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
-				mercurial-1.8.3-r1a3-x86-gcc4-2011-05-24.zip
-				: $(baseURL)/mercurial-1.8.3-r1a3-x86-gcc4-2011-05-24.zip
+				mercurial-2.2.2-x86-gcc4-2012-06-15.zip
+				: $(baseURL)/mercurial-2.2.2-x86-gcc4-2012-06-15.zip
 				: : true ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				mercurial-1.8.3-r1a3-x86-gcc2-2011-05-17.zip
-				: $(baseURL)/mercurial-1.8.3-r1a3-x86-gcc2-2011-05-17.zip
+				mercurial-2.2.2-x86-gcc2-2012-06-15.zip
+				: $(baseURL)/mercurial-2.2.2-x86-gcc2-2012-06-15.zip
 				: : true ;
 		}
 	}
@@ -1449,12 +1449,12 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] {
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
-				p7zip-9.13-r1a3-x86-gcc4-2011-05-24.zip
-				: $(baseURL)/p7zip-9.13-r1a3-x86-gcc4-2011-05-24.zip ;
+				p7zip-9.20.1-x86-gcc4-2012-06-15.zip
+				: $(baseURL)/p7zip-9.20.1-x86-gcc4-2011-06-15.zip ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				p7zip-9.13-r1a3-x86-gcc2-2011-05-18.zip
-				: $(baseURL)/p7zip-9.13-r1a3-x86-gcc2-2011-05-18.zip ;
+				p7zip-9.20.1-x86-gcc2-2012-06-15.zip
+				: $(baseURL)/p7zip-9.20.1-x86-gcc2-2012-06-15.zip ;
 		}
 		AddExpanderRuleToHaikuImage "application/x-7z-compressed" : .7z
 			: "7za l \\0045s"
@@ -1664,12 +1664,12 @@ if [ IsOptionalHaikuImagePackageAdded TagLib ] {
 		Echo "No optional package TagLib available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip
-			: $(baseURL)/taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip ;
+			taglib-1.7.2-x86-gcc4-2012-06-15.zip
+			: $(baseURL)/taglib-1.7.2-x86-gcc4-2012-06-15.zip ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip
-			: $(baseURL)/taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip ;
+			taglib-1.7.2-x86-gcc2-2012-06-15.zip
+			: $(baseURL)/taglib-1.7.2-x86-gcc2-2012-06-15.zip ;
 	}
 }
 
@@ -1681,12 +1681,12 @@ if [ IsOptionalHaikuImagePackageAdded Tar ] {
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
-				tar-1.25-r1a3-x86-gcc4-2011-05-24.zip
-				: $(baseURL)/tar-1.25-r1a3-x86-gcc4-2011-05-24.zip ;
+				tar-1.26-x86-gcc4-2012-06-15.zip
+				: $(baseURL)/tar-1.26-x86-gcc4-2012-06-15.zip ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				tar-1.25-r1a3-x86-gcc2-2011-05-20.zip
-				: $(baseURL)/tar-1.25-r1a3-x86-gcc2-2011-05-20.zip ;
+				tar-1.26-x86-gcc2-2012-06-15.zip
+				: $(baseURL)/tar-1.26-x86-gcc2-2012-06-15.zip ;
 		}
 	}
 }
@@ -1973,11 +1973,11 @@ if [ IsOptionalHaikuImagePackageAdded Yasm ] {
 		Echo "No optional package Yasm available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			yasm-1.1.0-r1a3-x86-gcc4-2011-05-24.zip
-			: $(baseURL)/yasm-1.1.0-r1a3-x86-gcc4-2011-05-24.zip ;
+			yasm-1.2.0-x86-gcc4-2012-06-15.zip
+			: $(baseURL)/yasm-1.2.0-x86-gcc4-2012-06-15.zip ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			yasm-1.1.0-r1a3-x86-gcc2-2011-05-17.zip
-			: $(baseURL)/yasm-1.1.0-r1a3-x86-gcc2-2011-05-17.zip ;
+			yasm-1.2.0-x86-gcc2-2012-06-15.zip
+			: $(baseURL)/yasm-1.2.0-x86-gcc2-2012-06-15.zip ;
 	}
 }