diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index eea9fc3e49..050d08da99 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -397,8 +397,8 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
 		Echo "No optional package CVS available for $(TARGET_ARCH)" ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			cvs-1.12.13-r1a1-x86-gcc2-2009-08-30-a.zip
-			: $(baseURL)/cvs-1.12.13-r1a1-x86-gcc2-2009-08-30-a.zip
+			cvs-1.12.13-r1a2-x86-gcc2-2010-04-29-a.zip
+			: $(baseURL)/cvs-1.12.13-r1a2-x86-gcc2-2010-04-29-a.zip
 			:
 			: true
 		;
@@ -411,15 +411,15 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
 # Development
 if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
 	# autotools
-	InstallOptionalHaikuImagePackage autoconf-2.65-x86-gcc2-2010-04-21-a.zip
-		: $(baseURL)/autoconf-2.65-x86-gcc2-2010-04-21-a.zip
+	InstallOptionalHaikuImagePackage autoconf-2.65-r1a2-x86-gcc2-2010-04-21-a.zip
+		: $(baseURL)/autoconf-2.65-r1a2-x86-gcc2-2010-04-21-a.zip
 		:
 		: true ;
 	InstallSourceArchive autoconf-2.65_haiku-2010-04-29.tar.xz
 		: $(baseSourceURL)/autoconf-2.65_haiku-2010-04-29.tar.xz
 	;
-	InstallOptionalHaikuImagePackage automake-1.11.1-x86-gcc2-2010-04-21-a.zip
-		: $(baseURL)/automake-1.11.1-x86-gcc2-2010-04-21-a.zip
+	InstallOptionalHaikuImagePackage automake-1.11.1-r1a2-x86-gcc2-2010-04-21-a.zip
+		: $(baseURL)/automake-1.11.1-r1a2-x86-gcc2-2010-04-21-a.zip
 		:
 		: true ;
 	InstallSourceArchive automake-1.11.1_haiku-2010-04-29.tar.xz
@@ -1139,8 +1139,8 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] {
 		Echo "No optional package Subversion available for $(TARGET_ARCH)" ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			subversion-1.6.9-x86-gcc2-2010-04-08-a.zip
-			: $(baseURL)/subversion-1.6.9-x86-gcc2-2010-04-08-a.zip
+			subversion-1.6.9-r1a2-x86-gcc2-2010-04-28-a.zip
+			: $(baseURL)/subversion-1.6.9-r1a2-x86-gcc2-2010-04-28-a.zip
 			:
 			: true
 			: true