diff --git a/src/qz/build/jlink/Vendor.java b/src/qz/build/jlink/Vendor.java
index 0b1cdbe9..7405e6b9 100644
--- a/src/qz/build/jlink/Vendor.java
+++ b/src/qz/build/jlink/Vendor.java
@@ -61,15 +61,28 @@ public String getUrlArch(Arch arch) {
                     default:
                         return "arm";
                 }
+            case RISCV64:
+                return "riscv64";
+            case X86:
+                switch(this) {
+                    case AZUL:
+                        return "i686";
+                    case BELLSOFT:
+                        return "i586";
+                    case ECLIPSE:
+                    case IBM:
+                        return "x86-32";
+                    case AMAZON:
+                    default:
+                        return "x86";
+                }
             case X86_64:
+            default:
                 switch(this) {
                     // BellSoft uses "amd64"
                     case BELLSOFT:
                         return "amd64";
                 }
-            case RISCV64:
-                return "riscv64";
-            default:
                 return "x64";
         }
     }