diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index acca8f22c4..79e20a9a0f 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -386,8 +386,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.zip
-			: $(baseURL)/cvs-1.12.13-r1a1-x86-gcc2-2009-08-30.zip
+			cvs-1.12.13-r1a2-x86-gcc2-2010-04-29.zip
+			: $(baseURL)/cvs-1.12.13-r1a2-x86-gcc2-2010-04-29.zip
 			:
 			: true
 		;
@@ -961,8 +961,8 @@ if [ IsOptionalHaikuImagePackageAdded PCRE ] {
 			;
 		} else {
 			InstallOptionalHaikuImagePackage
-				libpcre-8.02-x86-gcc2-2010-04-16.zip
-				: $(baseURL)/libpcre-8.02-x86-gcc2-2010-04-16.zip
+				libpcre-8.02-r1a2-x86-gcc2-2010-04-28.zip
+				: $(baseURL)/libpcre-8.02-r1a2-x86-gcc2-2010-04-28.zip
 			;
 		}
 	}
@@ -1075,8 +1075,8 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] {
 		Echo "No optional package Subversion available for $(TARGET_ARCH)" ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			subversion-1.6.9-x86-gcc2-2010-04-08.zip
-			: $(baseURL)/subversion-1.6.9-x86-gcc2-2010-04-08.zip
+			subversion-1.6.9-r1a2-x86-gcc2-2010-04-28.zip
+			: $(baseURL)/subversion-1.6.9-r1a2-x86-gcc2-2010-04-28.zip
 			:
 			: true
 			: true