diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages
index 9871d15602..8031612c5e 100644
--- a/build/jam/OptionalLibPackages
+++ b/build/jam/OptionalLibPackages
@@ -285,8 +285,8 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
 			sdl-sound-1.0.3-r1a3-x86-gcc2-2011-05-19.zip
 			: $(baseURL)/lib/sdl-sound-1.0.3-r1a3-x86-gcc2-2011-05-19.zip ;
 		InstallOptionalHaikuImagePackage
-			sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip
-			: $(baseURL)/lib/sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip ;
+			sdl-rtf-0.1.0-r1a3-x86-gcc2-2011-05-20.zip
+			: $(baseURL)/lib/sdl-rtf-0.1.0-r1a3-x86-gcc2-2011-05-20.zip ;
 		InstallOptionalHaikuImagePackage
 			sdl-ttf-2.0.10-r1a3-x86-gcc2-2011-05-19.zip
 			: $(baseURL)/lib/sdl-ttf-2.0.10-r1a3-x86-gcc2-2011-05-19.zip ;
@@ -297,8 +297,8 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
 			smjpeg-0.2.1-r1a3-x86-gcc2-2011-05-19.zip
 			: $(baseURL)/lib/smjpeg-0.2.1-r1a3-x86-gcc2-2011-05-19.zip ;
 		InstallOptionalHaikuImagePackage
-			smpeg-0.4.5-r1a3-x86-gcc2-2011-05-19.zip
-			: $(baseURL)/lib/smpeg-0.4.5-x86-gcc2-2010-10-29.zip ;
+			smpeg-0.4.5-r1a3-x86-gcc2-2011-05-20.zip
+			: $(baseURL)/lib/smpeg-0.4.5-r1a3-x86-gcc2-2011-05-20.zip ;
 	}
 }
 
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 1faee1c605..012dd6c8f7 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -148,8 +148,8 @@ if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] {
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
 		Echo "No optional package ArmyKnife for gcc4" ;
 	} else {
-		InstallOptionalHaikuImagePackage armyknife-61-x86-gcc2-2010-10-30.zip
-			: $(baseURL)/armyknife-61-x86-gcc2-2010-10-30.zip ;
+		InstallOptionalHaikuImagePackage armyknife-61-r1a3-x86-gcc2-2011-05-20.zip
+			: $(baseURL)/armyknife-61-r1a3-x86-gcc2-2011-05-20.zip ;
 		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/ArmyKnife/ArmyKnife ;
 	}
@@ -1478,8 +1478,8 @@ if [ IsOptionalHaikuImagePackageAdded TagLib ] {
 			: $(baseURL)/taglib-1.6.3-x86-gcc4-2011-05-13.zip ;		
 	} else {
 		InstallOptionalHaikuImagePackage
-			taglib-1.6.3-r1a2-x86-gcc2-2010-04-25.zip
-			: $(baseURL)/taglib-1.6.3-r1a2-x86-gcc2-2010-04-25.zip ;
+			taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip
+			: $(baseURL)/taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip ;
 	}
 }