diff --git a/bucket/wapm-cli.json b/bucket/wapm-cli.json
new file mode 100644
index 0000000000..4a7ea6bb3a
--- /dev/null
+++ b/bucket/wapm-cli.json
@@ -0,0 +1,29 @@
+{
+    "version": "0.5.4",
+    "description": "WebAssembly package manager.",
+    "homepage": "https://wapm.io/",
+    "license": "MIT",
+    "suggest": {
+        "wasmer": "wasmer"
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/wasmerio/wapm-cli/releases/download/v0.5.4/wapm-cli-windows-amd64.tar.gz",
+            "hash": "8f198c2c31b435152eda047035c2e49d4f9cf8d2d95714d37521590392b0ecda"
+        }
+    },
+    "bin": [
+        "bin\\wapm.exe",
+        "bin\\wax.cmd"
+    ],
+    "checkver": {
+        "github": "https://github.com/wasmerio/wapm-cli"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/wasmerio/wapm-cli/releases/download/v$version/wapm-cli-windows-amd64.tar.gz"
+            }
+        }
+    }
+}
diff --git a/bucket/wasmer.json b/bucket/wasmer.json
index fdf3680c86..db6c337e4a 100644
--- a/bucket/wasmer.json
+++ b/bucket/wasmer.json
@@ -3,6 +3,9 @@
     "description": "The leading WebAssembly Runtime supporting WASI and Emscripten",
     "homepage": "https://wasmer.io/",
     "license": "MIT",
+    "suggest": {
+        "wapm": "wapm-cli"
+    },
     "architecture": {
         "64bit": {
             "url": "https://github.com/wasmerio/wasmer/releases/download/2.3.0/wasmer-windows.exe",
@@ -13,10 +16,7 @@
         "WASMER_DIR": "$dir",
         "WASMER_CACHE_DIR": "$dir\\cache"
     },
-    "bin": [
-        "bin\\wax.cmd",
-        "bin\\wasmer.exe"
-    ],
+    "bin": "bin\\wasmer.exe",
     "innosetup": true,
     "checkver": {
         "github": "https://github.com/wasmerio/wasmer",