diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index ec6b5c327d..94905d6e5d 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1052,18 +1052,19 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] {
 		Echo "No optional package P7zip available for $(TARGET_ARCH)" ;
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
-			InstallOptionalHaikuImagePackage p7zip-9.04-x86-gcc4-2009-10-25.zip
-				: $(baseURL)/p7zip-9.04-x86-gcc4-2009-10-25.zip
+			InstallOptionalHaikuImagePackage 
+				p7zip-9.04-r1a2-x86-gcc4-2010-05-06.zip
+				: $(baseURL)/p7zip-9.04-r1a2-x86-gcc4-2010-05-06.zip
 				:
 			;
 		} else {
 			InstallOptionalHaikuImagePackage
-				p7zip-9.04-r1a2-x86-gcc2-2010-04-22c-a.zip
-				: $(baseURL)/p7zip-9.04-r1a2-x86-gcc2-2010-04-22c-a.zip
+				p7zip-9.04-r1a2-x86-gcc2-2010-05-06.zip
+				: $(baseURL)/p7zip-9.04-r1a2-x86-gcc2-2010-05-06.zip
 				:
 			;
-			InstallSourceArchive p7zip-9.04_haiku-2010-04-29.tar.xz
-				: $(baseSourceURL)/p7zip-9.04_haiku-2010-04-29.tar.xz ;
+			InstallSourceArchive p7zip-9.04_haiku-2010-05-06.tar.xz
+				: $(baseSourceURL)/p7zip-9.04_haiku-2010-05-06.tar.xz ;
 		}
 		AddExpanderRuleToHaikuImage "application/x-7z-compressed" : .7z
 			: "7za l \\0045s"