diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 896398d480..56ed53b027 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -2358,12 +2358,17 @@ if [ IsOptionalHaikuImagePackageAdded WQY-MicroHei ] {
 
 # XZ-Utils
 if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ;
-	} else {
-		InstallOptionalHaikuImagePackage
-			xz-utils-5.0.1-r1a4-x86-gcc4-2012-09-03.zip
-			: $(baseURL)/xz-utils-5.0.1-r1a4-x86-gcc4-2012-09-03.zip ;
+	if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
+		if $(TARGET_ARCH) = x86_64 {
+			InstallOptionalHaikuImagePackage
+				xz-utils-5.0.4-x86_64-2013-02-16.zip
+				: $(baseURL)/xz-utils-5.0.4-x86_64-2013-02-16.zip ;
+		} else {
+			InstallOptionalHaikuImagePackage
+				xz-utils-5.0.4-x86-gcc4-2013-02-16.zip
+				: $(baseURL)/xz-utils-5.0.4-x86-gcc4-2013-02-16.zip ;
+		}
+
 		AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
 			: "tar -Jtvf \\0045s"
 			: "tar -Jxvf \\0045s"
@@ -2376,6 +2381,8 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
 			: "echo \\0045s | sed 's/.xz\\\$//g'"
 			: "xz -df \\0045s"
 		;
+	} else {
+		Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ;
 	}
 }