diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 5cc6810898..d0f5ea20c4 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -2214,19 +2214,24 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
 
 # Vision
 if [ IsOptionalHaikuImagePackageAdded Vision ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package Vision available for $(TARGET_ARCH)" ;
-	} else {
+	if $(TARGET_ARCH) = x86 {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
-			InstallOptionalHaikuImagePackage vision-0.9.7-x86-gcc4-2013-06-04-2.zip
-				: $(baseURL)/vision-0.9.7-x86-gcc4-2013-06-04.zip ;
+			InstallOptionalHaikuImagePackage vision-0.9.7-x86-gcc4-2013-07-28.zip
+				: $(baseURL)/vision-0.9.7-x86-gcc4-2013-07-28.zip ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				vision-0.9.7-x86-gcc2-2013-06-04-2.zip
-				: $(baseURL)/vision-0.9.7-x86-gcc2-2013-06-04.zip ;
+				vision-0.9.7-x86-gcc2-2013-07-28.zip
+				: $(baseURL)/vision-0.9.7-x86-gcc2-2013-07-28.zip ;
 		}
 		AddSymlinkToHaikuImage home config settings deskbar Applications
 			: /boot/apps/Vision/Vision ;
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage vision-0.9.7-x86_64-2013-07-28.zip
+			:  $(baseURL)/vision-0.9.7-x86_64-2013-07-28.zip ;
+		AddSymlinkToHaikuImage home config settings deskbar Applications
+			: /boot/apps/Vision/Vision ;
+	} else {
+		Echo "No optional package Vision available for $(TARGET_ARCH)" ;
 	}
 }