diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 1f5ed04e19..64e7962f13 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -693,13 +693,11 @@ if [ IsOptionalHaikuImagePackageAdded Git ] {
 		Echo "No optional package Git available for $(TARGET_ARCH)" ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			git-1.7.0.5-r1a2-x86-gcc2-2010-04-22-a.zip
-			: $(baseURL)/git-1.7.0.5-r1a2-x86-gcc2-2010-04-22-a.zip
+			git-1.7.1-x86-gcc2-2010-05-26.zip
+			: $(baseURL)/git-1.7.1-x86-gcc2-2010-05-26.zip
 			:
 			: true
 		;
-		InstallSourceArchive git-1.7.0.5_haiku-2010-04-29.tar.xz
-			: $(baseSourceURL)/git-1.7.0.5_haiku-2010-04-29.tar.xz ;
 	}
 }
 
@@ -1017,12 +1015,10 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
 				"variable to be set!" ;
 		}
 		InstallOptionalHaikuImagePackage
-			openssh-5.5p1-r1a2-x86-gcc2-2010-04-30-a.zip
-			: $(baseURL)/openssh-5.5p1-r1a2-x86-gcc2-2010-04-30-a.zip
+			openssh-5.5p1-x86-gcc2-2010-05-26.zip
+			: $(baseURL)/openssh-5.5p1-x86-gcc2-2010-05-26.zip
 			:
 		;
-		InstallSourceArchive openssh-5.5p1_haiku-2010-04-30.tar.xz
-			: $(baseSourceURL)/openssh-5.5p1_haiku-2010-04-30.tar.xz ;
 
 		AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true
 			: "sshd user" ;
@@ -1145,14 +1141,12 @@ if [ IsOptionalHaikuImagePackageAdded Python ] {
 		Echo "No optional package Python available for $(TARGET_ARCH)" ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			python-2.6.5-r1a2-x86-gcc2-2010-04-25-a.zip
-			: $(baseURL)/python-2.6.5-r1a2-x86-gcc2-2010-04-25-a.zip
+			python-2.6.5-x86-gcc2-2010-05-26.zip
+			: $(baseURL)/python-2.6.5-x86-gcc2-2010-05-26.zip
 			:
 			: true
 			: true
 		;
-		InstallSourceArchive python-2.6.5_haiku-2010-04-29.tar.xz
-			: $(baseSourceURL)/python-2.6.5_haiku-2010-04-29.tar.xz ;
 	}
 }