diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages
index 8031612c5e..fe34fa36d1 100644
--- a/build/jam/OptionalLibPackages
+++ b/build/jam/OptionalLibPackages
@@ -83,8 +83,8 @@ if [ IsOptionalHaikuImagePackageAdded fribidi ] {
 		Echo "No optional package fribidi available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			fribidi-0.19.2-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/fribidi-0.19.2-x86-gcc4-2010-10-30.zip
+			fribidi-0.19.2-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/fribidi-0.19.2-r1a3-x86-gcc4-2011-05-26.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
@@ -101,8 +101,8 @@ if [ IsOptionalHaikuImagePackageAdded lcms ] {
 		Echo "No optional package lcms available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			lcms-2.0a-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/lcms-2.0a-x86-gcc4-2010-10-30.zip
+			lcms-2.1-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/lcms-2.1-r1a3-x86-gcc4-2011-05-26.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
@@ -119,8 +119,8 @@ if [ IsOptionalHaikuImagePackageAdded libart_lgpl ] {
 		Echo "No optional package libart_lgpl available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
+			libart_lgpl-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/libart_lgpl-r1a3-x86-gcc4-2011-05-26.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
@@ -137,8 +137,8 @@ if [ IsOptionalHaikuImagePackageAdded libmad ] {
 		Echo "No optional package libmad available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			libmad-0.15.1-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/libmad-0.15.1-x86-gcc4-2010-10-30.zip
+			libmad-0.15.1b-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/libmad-0.15.1b-r1a3-x86-gcc4-2011-05-26.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
@@ -155,8 +155,8 @@ if [ IsOptionalHaikuImagePackageAdded libmikmod ] {
 		Echo "No optional package libmikmod available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
+			libmikmod-3.1.11-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/libmikmod-3.1.11-r1a3-x86-gcc4-2011-05-26.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
@@ -173,8 +173,8 @@ if [ IsOptionalHaikuImagePackageAdded libmodplug ] {
 		Echo "No optional package libmodplug available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
+			libmodplug-0.8.8.1-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/libmodplug-0.8.8.1-r1a3-x86-gcc4-2011-05-26.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
@@ -191,8 +191,8 @@ if [ IsOptionalHaikuImagePackageAdded libpaper ] {
 		Echo "No optional package libpaper available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			libpaper-1.1.24-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/libpaper-1.1.24-x86-gcc4-2010-10-30.zip
+			libpaper-1.1.24-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/libpaper-1.1.24-r1a3-x86-gcc4-2011-05-26.zip
 			: : true ;
 	} else {
 		InstallOptionalHaikuImagePackage
@@ -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-x86-gcc4-2010-12-23.zip
-			: $(baseURL)/lib/libsdl-1.2-hg-x86-gcc4-2010-12-23.zip ;
+			libsdl-1.2.14-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/libsdl-1.2.14-r1a3-x86-gcc4-2011-05-26.zip ;
 		InstallOptionalHaikuImagePackage
-			guilib-1.2.1-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/guilib-1.2.1-x86-gcc4-2010-10-30.zip ;
+			guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip ;
+			sdl-gfx-2.0.20-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/sdl-gfx-r1a3-x86-gcc4-2011-05-26.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-image-1.2.10-x86-gcc2-2010-10-30.zip
-			: $(baseURL)/lib/sdl-image-1.2.10-x86-gcc4-2010-10-30.zip ;
+			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 ;
 		InstallOptionalHaikuImagePackage
-			sdl-mixer-1.2.11-x86-gcc2-2010-10-30.zip
-			: $(baseURL)/lib/sdl-mixer-1.2.11-x86-gcc4-2010-10-30.zip ;
+			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 ;
 		InstallOptionalHaikuImagePackage
-			sdl-net-1.2.7-x86-gcc2-2010-10-30.zip
-			: $(baseURL)/lib/sdl-net-1.2.7-x86-gcc4-2010-10-30.zip ;
+			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 ;
 		InstallOptionalHaikuImagePackage
-			sdl-sound-1.0.3-x86-gcc2-2010-10-30.zip
-			: $(baseURL)/lib/sdl-sound-1.0.3-x86-gcc4-2010-10-30.zip ;
+			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 ;
 		InstallOptionalHaikuImagePackage
-			sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/sdl-rtf-0.1.0-x86-gcc4-2010-12-26.zip ;
+			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-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip ;
+			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 ;
 		InstallOptionalHaikuImagePackage
-			sge-030809-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/sge-030809-x86-gcc4-2010-10-30.zip ;
+			sge-030809-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/sge-030809-r1a3-x86-gcc4-2011-05-26.zip ;
 		InstallOptionalHaikuImagePackage
-			smjpeg-0.2.1-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/smjpeg-0.2.1-x86-gcc4-2010-10-30.zip ;
+			smjpeg-0.2.1-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/smjpeg-0.2.1-r1a3-x86-gcc4-2011-05-26.zip ;
 		InstallOptionalHaikuImagePackage
-			smpeg-0.4.5-x86-gcc4-2010-10-29.zip
-			: $(baseURL)/lib/smpeg-0.4.5-x86-gcc4-2010-10-30.zip ;
+			smpeg-0.4.5-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/smpeg-0.4.5-r1a3-x86-gcc4-2011-05-26.zip ;
 	} else {
 		InstallOptionalHaikuImagePackage
 			libsdl-1.2.14-r1a3-x86-gcc2-2011-05-19.zip
@@ -309,26 +309,26 @@ if [ IsOptionalHaikuImagePackageAdded XiphLibs ] {
 		Echo "No optional package XiphLibs available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
-			flac-1.2.1-x86-gcc4-2010-10-31.zip
-			: $(baseURL)/lib/flac-1.2.1-x86-gcc4-2010-10-31.zip ;
+			flac-1.2.1-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/flac-1.2.1-r1a3-x86-gcc4-2011-05-26.zip ;
 		InstallOptionalHaikuImagePackage
-			libao-1.0.0-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/libao-1.0.0-x86-gcc4-2010-10-30.zip ;
+			libao-1.0.0-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/libao-1.0.0-r1a3-x86-gcc4-2011-05-26.zip ;
 		InstallOptionalHaikuImagePackage
-			libogg-1.2.0-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/libogg-1.2.0-x86-gcc4-2010-10-30.zip ;
+			libogg-1.2.2-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/libogg-1.2.2-r1a3-x86-gcc4-2011-05-26.zip ;
 		InstallOptionalHaikuImagePackage
-			libtheora-1.1.1-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/libtheora-1.1.1-x86-gcc4-2010-10-30.zip ;
+			libtheora-1.1.1-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/libtheora-1.1.1-r1a3-x86-gcc4-2011-05-26.zip ;
 		InstallOptionalHaikuImagePackage
-			libvorbis-1.3.1-x86-gcc4-2010-10-30.zip
-			: $(baseURL)/lib/libvorbis-1.3.1-x86-gcc4-2010-10-30.zip ;
+			libvorbis-1.3.2-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/libvorbis-1.3.2-r1a3-x86-gcc4-2011-05-26.zip ;
 		InstallOptionalHaikuImagePackage
 			speex-1.2-git-x86-gcc4-2010-10-30.zip
 			: $(baseURL)/lib/speex-1.2-git-x86-gcc4-2010-10-30.zip ;
 		InstallOptionalHaikuImagePackage
-			vorbis-tools-1.4.0-x86-gcc4-2010-12-30.zip
-			: $(baseURL)/lib/vorbis-tools-1.4.0-x86-gcc4-2010-12-30.zip ;
+			vorbis-tools-1.4.0-r1a3-x86-gcc4-2011-05-26.zip
+			: $(baseURL)/lib/vorbis-tools-1.4.0-r1a3-x86-gcc4-2011-05-26.zip ;
 	} else {
 		InstallOptionalHaikuImagePackage
 			flac-1.2.1-r1a3-x86-gcc2-2011-05-19.zip