diff --git a/bucket/yubico-piv-tool.json b/bucket/yubico-piv-tool.json
index 7169de013b..92ee75c117 100644
--- a/bucket/yubico-piv-tool.json
+++ b/bucket/yubico-piv-tool.json
@@ -1,30 +1,34 @@
 {
-    "homepage": "https://developers.yubico.com/yubico-piv-tool/",
-    "description": "A tool to interact with the Privilege and Identification Card (PIV) application on a YubiKey.",
     "version": "2.0.0",
+    "description": "A tool to interact with the Privilege and Identification Card (PIV) application on a YubiKey.",
+    "homepage": "https://developers.yubico.com/yubico-piv-tool/",
     "license": "BSD-2-Clause",
     "architecture": {
         "64bit": {
             "url": "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-2.0.0-win64.zip",
-            "hash": "7f6c3357d3c4adda17d2326f4c43f385cad12c8471560fdc9660432d4fc4a310"
+            "hash": "7f6c3357d3c4adda17d2326f4c43f385cad12c8471560fdc9660432d4fc4a310",
+            "extract_dir": "yubico-piv-tool-2.0.0-win64"
         },
         "32bit": {
             "url": "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-2.0.0-win32.zip",
-            "hash": "9a4d2893aa25e8df04f764557f74178fce0d42e39dfd65ad7fb5d86a36f6af54"
+            "hash": "9a4d2893aa25e8df04f764557f74178fce0d42e39dfd65ad7fb5d86a36f6af54",
+            "extract_dir": "yubico-piv-tool-2.0.0-win32"
         }
     },
     "bin": "bin\\yubico-piv-tool.exe",
     "checkver": {
         "url": "https://developers.yubico.com/yubico-piv-tool/Releases/",
-        "re": "yubico-piv-tool-([\\d.]+)-win64.zip"
+        "regex": "yubico-piv-tool-([\\d.]+)-win64\\.zip"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-$version-win64.zip"
+                "url": "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-$version-win64.zip",
+                "extract_dir": "yubico-piv-tool-$version-win64"
             },
             "32bit": {
-                "url": "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-$version-win32.zip"
+                "url": "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-$version-win32.zip",
+                "extract_dir": "yubico-piv-tool-$version-win32"
             }
         }
     }