diff --git a/bucket/abc.json b/bucket/abc.json
new file mode 100644
index 0000000000..aa40c1e80b
--- /dev/null
+++ b/bucket/abc.json
@@ -0,0 +1,18 @@
+{
+    "version": "1.0.0-beta.1",
+    "description": "Command-line tool to interact with appbase.io",
+    "homepage": "https://github.com/appbaseio/abc",
+    "license": "Apache-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/appbaseio/abc/releases/download/1.0.0-beta.1/abc-windows.zip",
+            "hash": "5fe08d7f8197e683abdb0adc91f6bc5db57f2bc1c2e13dd3bacf4c73de841548"
+        }
+    },
+    "pre_install": "Rename-Item \"$dir\\abc-windows\" 'abc.exe' -ErrorAction SilentlyContinue",
+    "bin": "abc.exe",
+    "checkver": {
+        "github": "https://github.com/appbaseio/abc",
+        "regex": "tag/([\\w.-]+)"
+    }
+}
diff --git a/bucket/avrdude.json b/bucket/avrdude.json
new file mode 100644
index 0000000000..67534c066b
--- /dev/null
+++ b/bucket/avrdude.json
@@ -0,0 +1,17 @@
+{
+    "version": "6.3-20171130",
+    "description": "AVRDUDE is software for programming Atmel AVR Microcontrollers",
+    "homepage": "https://osdn.net/projects/avrdude",
+    "license": "GPL-2.0-or-later",
+    "architecture": {
+        "64bit": {
+            "url": "https://dotsrc.dl.osdn.net/osdn/avrdude/72328/avrdude-64.zip",
+             "hash": "b5f7cccd8c5cbd57d425c3302761990a3cd92479f988bcd54cd2d0d3856ad129"
+        },
+        "32bit": {
+            "url": "https://dotsrc.dl.osdn.net/osdn/avrdude/72328/avrdude.zip",
+            "hash": "f7c047d95ed5bf5b2e932ea5e36652f25a3b7eb2b22edea1c0986785013f07ef"
+        }
+    },
+    "bin": "avrdude.exe"
+}
diff --git a/bucket/azure-cli.json b/bucket/azure-cli.json
index 1ec2651278..a358100ded 100644
--- a/bucket/azure-cli.json
+++ b/bucket/azure-cli.json
@@ -13,5 +13,9 @@
     },
     "autoupdate": {
         "url": "https://azurecliprod.azureedge.net/msi/azure-cli-$version.msi"
+    },
+    "env_set": {
+        "AzureCLIPath": "$dir",
+        "AZURE_CLI_PATH": "$dir"
     }
 }
diff --git a/bucket/azure-ps.json b/bucket/azure-ps.json
index 6a77089b7e..46c3fcf9b3 100644
--- a/bucket/azure-ps.json
+++ b/bucket/azure-ps.json
@@ -18,8 +18,8 @@
         "name": "AzureRM"
     },
     "checkver": {
-        "github": "https://github.com/Azure/azure-powershell",
-        "regex": "download/v?(?<release>[\\w-.]+)/Az-Cmdlets-([\\d.]+)-x64\\.msi"
+        "url": "https://github.com/Azure/azure-powershell/releases",
+        "regex": "download/v(?<release>[^/]+)/Az-Cmdlets-([0-9.]+)-x64[.]msi"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/balena-cli.json b/bucket/balena-cli.json
index 49da2ba6fa..46ca83a91a 100644
--- a/bucket/balena-cli.json
+++ b/bucket/balena-cli.json
@@ -1,12 +1,12 @@
 {
-    "version": "12.25.1",
+    "version": "12.25.2",
     "description": "Official balena CLI for interacting with balenaCloud and balena API.",
     "homepage": "https://github.com/balena-io/balena-cli",
     "license": "Apache-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/balena-io/balena-cli/releases/download/v12.25.1/balena-cli-v12.25.1-windows-x64-standalone.zip",
-            "hash": "c61f8ec94df46b773f9801e067c0d7ebe15ae9eb548afd512877fa99fe9d1334"
+            "url": "https://github.com/balena-io/balena-cli/releases/download/v12.25.2/balena-cli-v12.25.2-windows-x64-standalone.zip",
+            "hash": "5d2ea68728b338e9dd737311a008e78d61ecf988872c3153ca69608c0202ff88"
         }
     },
     "extract_dir": "balena-cli",
diff --git a/bucket/boundary.json b/bucket/boundary.json
new file mode 100644
index 0000000000..239641cf24
--- /dev/null
+++ b/bucket/boundary.json
@@ -0,0 +1,34 @@
+{
+    "version": "0.1.0",
+    "description": "Simple and secure remote access for any system from anywhere based on user identity",
+    "homepage": "https://www.boundaryproject.io",
+    "license": "MPL-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://releases.hashicorp.com/boundary/0.1.0/boundary_0.1.0_windows_amd64.zip",
+            "hash": "88b94e7a11ba91ccb081487cd32be934971609d64f17062bbc53ed5b798ff602"
+        },
+        "32bit": {
+            "url": "https://releases.hashicorp.com/boundary/0.1.0/boundary_0.1.0_windows_386.zip",
+            "hash": "2dcf0b857870cdf1fcbfef11291b03158b3a7f055edec3f48c98c82dccc24e8b"
+        }
+    },
+    "bin": "boundary.exe",
+    "checkver": {
+        "url": "https://releases.hashicorp.com/boundary/",
+        "regex": "boundary_([\\d.]+)</a>"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://releases.hashicorp.com/boundary/$version/boundary_$version_windows_amd64.zip"
+            },
+            "32bit": {
+                "url": "https://releases.hashicorp.com/boundary/$version/boundary_$version_windows_386.zip"
+            }
+        },
+        "hash": {
+            "url": "$baseurl/boundary_$version_SHA256SUMS"
+        }
+    }
+}
diff --git a/bucket/coursier.json b/bucket/coursier.json
index 15d1ec9590..ae609b477d 100644
--- a/bucket/coursier.json
+++ b/bucket/coursier.json
@@ -1,10 +1,10 @@
 {
-    "version": "2.0.3",
+    "version": "2.0.4",
     "description": "Pure Scala Artifact Fetching",
     "homepage": "https://github.com/coursier/coursier",
     "license": "Apache-2.0",
-    "url": "https://github.com/coursier/coursier/releases/download/v2.0.3/coursier#/coursier.jar",
-    "hash": "dddbe6ae867fac0785700b277bce055422c0ff8e7bd48485e631e08ca3676c4b",
+    "url": "https://github.com/coursier/coursier/releases/download/v2.0.4/coursier#/coursier.jar",
+    "hash": "9fcf4f3f904d4d5f3be15e1a75c871fdc6428ae79ab3800cf752e44495f05211",
     "bin": "coursier.jar",
     "env_set": {
         "COURSIER_HOME": "${env:LOCALAPPDATA}\\Coursier"
diff --git a/bucket/cuda.json b/bucket/cuda.json
index a2a666b719..2f1992d430 100644
--- a/bucket/cuda.json
+++ b/bucket/cuda.json
@@ -1,5 +1,5 @@
 {
-    "version": "10.2.89_441.22",
+    "version": "11.0.3_451.82",
     "description": "A parallel computing platform and programming model invented by NVIDIA",
     "homepage": "https://developer.nvidia.com/cuda-toolkit",
     "license": {
@@ -8,8 +8,8 @@
     },
     "architecture": {
         "64bit": {
-            "url": "https://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_441.22_win10.exe#/dl.7z",
-            "hash": "md5:d9f5b9f24c3d3fc456a3c789f9b43419"
+            "url": "http://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_451.82_win10.exe#/dl.7z",
+            "hash": "md5:80ae0fdbe04759123f3cab81f2aadabd"
         }
     },
     "installer": {
@@ -30,16 +30,16 @@
     },
     "checkver": {
         "url": "https://developer.nvidia.com/cuda-downloads?target_os=Windows&target_arch=x86_64&target_version=10&target_type=exelocal",
-        "regex": "/cuda_([\\d._]+)_win10.exe"
+        "regex": "/cuda_([\\d._]+)_win10\\.exe"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://developer.download.nvidia.com/compute/cuda/$majorVersion.$minorVersion/Prod/local_installers/cuda_$version_win10.exe#/dl.7z"
+                "url": "http://developer.download.nvidia.com/compute/cuda/$matchHead/local_installers/cuda_$version_win10.exe#/dl.7z"
             }
         },
         "hash": {
-            "url": "http://developer.download.nvidia.com/compute/cuda/$majorVersion.$minorVersion/Prod/docs/sidebar/md5sum.txt"
+            "url": "https://developer.download.nvidia.com/compute/cuda/$matchHead/docs/sidebar/md5sum.txt"
         }
     }
 }
diff --git a/bucket/elm.json b/bucket/elm.json
index fac40cfb6c..f7322b362d 100644
--- a/bucket/elm.json
+++ b/bucket/elm.json
@@ -3,7 +3,12 @@
     "description": "Elm language compiler.",
     "homepage": "https://elm-lang.org",
     "license": "BSD-3-Clause",
-    "depends": "nodejs",
+    "suggest": {
+        "nodejs": [
+            "nodejs",
+            "nodejs-lts"
+        ]
+    },
     "url": "https://github.com/elm/compiler/releases/download/0.19.1/installer-for-windows.exe#/dl.7z",
     "hash": "02947d00090f556abcf8f8e95997ac993825bd783abf05786afe8f60a002d496",
     "extract_dir": "bin",
diff --git a/bucket/ffmpeg-nightly-shared-vulkan.json b/bucket/ffmpeg-nightly-shared-vulkan.json
index 411ae21d3a..ffde2d6795 100644
--- a/bucket/ffmpeg-nightly-shared-vulkan.json
+++ b/bucket/ffmpeg-nightly-shared-vulkan.json
@@ -1,13 +1,13 @@
 {
-    "version": "99658",
+    "version": "99681",
     "description": "A complete, cross-platform solution to record, convert and stream audio and video.",
     "homepage": "https://ffmpeg.org",
     "license": "GPL-3.0-or-later",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-20-12-32/ffmpeg-N-99658-g8750c8f45c-win64-gpl-shared-vulkan.zip",
-            "hash": "bc58fc3c38473735f6ea5aa201cb995714fe5661890eea2c83cd763f3b4b5e5b",
-            "extract_dir": "ffmpeg-N-99658-g8750c8f45c-win64-gpl-shared-vulkan"
+            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-21-12-32/ffmpeg-N-99681-g289e964873-win64-gpl-shared-vulkan.zip",
+            "hash": "d834cddecd9cb650c8d25fccc1916c8a9a97ab52716f98f717de94ee3ffec2a7",
+            "extract_dir": "ffmpeg-N-99681-g289e964873-win64-gpl-shared-vulkan"
         }
     },
     "bin": [
diff --git a/bucket/ffmpeg-nightly-shared.json b/bucket/ffmpeg-nightly-shared.json
index a29423d660..8300b11082 100644
--- a/bucket/ffmpeg-nightly-shared.json
+++ b/bucket/ffmpeg-nightly-shared.json
@@ -1,13 +1,13 @@
 {
-    "version": "99658",
+    "version": "99681",
     "description": "A complete, cross-platform solution to record, convert and stream audio and video.",
     "homepage": "https://ffmpeg.org",
     "license": "GPL-3.0-or-later",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-20-12-32/ffmpeg-N-99658-g8750c8f45c-win64-gpl-shared.zip",
-            "hash": "695eefa9749a80b45d65c1d40324a327aa9b5df14bf247814132a4676d385bf5",
-            "extract_dir": "ffmpeg-N-99658-g8750c8f45c-win64-gpl-shared"
+            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-21-12-32/ffmpeg-N-99681-g289e964873-win64-gpl-shared.zip",
+            "hash": "c643f0d947fd36afecf8a4f5b8ca5e569c35b979f3e6289a83768935cd29c847",
+            "extract_dir": "ffmpeg-N-99681-g289e964873-win64-gpl-shared"
         }
     },
     "bin": [
diff --git a/bucket/ffmpeg-nightly-vulkan.json b/bucket/ffmpeg-nightly-vulkan.json
index 8aad16d514..125dfbffb7 100644
--- a/bucket/ffmpeg-nightly-vulkan.json
+++ b/bucket/ffmpeg-nightly-vulkan.json
@@ -1,13 +1,13 @@
 {
-    "version": "99658",
+    "version": "99681",
     "description": "A complete, cross-platform solution to record, convert and stream audio and video.",
     "homepage": "https://ffmpeg.org",
     "license": "GPL-3.0-or-later",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-20-12-32/ffmpeg-N-99658-g8750c8f45c-win64-gpl-vulkan.zip",
-            "hash": "193b18ceb435d7427a43d7b1e8b94a78ab3490e22a397a7360159e33ebf0fd9d",
-            "extract_dir": "ffmpeg-N-99658-g8750c8f45c-win64-gpl-vulkan"
+            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-21-12-32/ffmpeg-N-99681-g289e964873-win64-gpl-vulkan.zip",
+            "hash": "3983d4e83e0762854d62db6b69c62d12df23c8f755c87d0cf4188b558bbcf71a",
+            "extract_dir": "ffmpeg-N-99681-g289e964873-win64-gpl-vulkan"
         }
     },
     "bin": [
diff --git a/bucket/ffmpeg-nightly.json b/bucket/ffmpeg-nightly.json
index 84f9a15bb8..0e73f7de5b 100644
--- a/bucket/ffmpeg-nightly.json
+++ b/bucket/ffmpeg-nightly.json
@@ -1,13 +1,13 @@
 {
-    "version": "99658",
+    "version": "99681",
     "description": "A complete, cross-platform solution to record, convert and stream audio and video.",
     "homepage": "https://ffmpeg.org",
     "license": "GPL-3.0-or-later",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-20-12-32/ffmpeg-N-99658-g8750c8f45c-win64-gpl.zip",
-            "hash": "0d99f21dcb7d5c8e12393b68e03d2b247f5cb65cadff02cf34106cf6d62ecc48",
-            "extract_dir": "ffmpeg-N-99658-g8750c8f45c-win64-gpl"
+            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-21-12-32/ffmpeg-N-99681-g289e964873-win64-gpl.zip",
+            "hash": "e7f41b149c4379f2e739e422c3e80dbd4be6a295faa2ec2ac504e2bbb919f8e6",
+            "extract_dir": "ffmpeg-N-99681-g289e964873-win64-gpl"
         }
     },
     "bin": [
diff --git a/bucket/gcc.json b/bucket/gcc.json
index fcadce448c..09a8542d63 100644
--- a/bucket/gcc.json
+++ b/bucket/gcc.json
@@ -1,179 +1,115 @@
 {
-    "homepage": "https://mingw-w64.org",
+    "version": "9.3.0-2",
     "description": "GNU Compiler Collection (Mingw-w64 port from MSYS2 project)",
-    "version": "9.3.0-1",
+    "homepage": "https://mingw-w64.org",
     "license": "GPL-3.0-or-later,ZPL-2.1,...",
     "architecture": {
         "64bit": {
             "url": [
                 "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.34-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-8.0.0.5685.ef310786-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-8.0.0.5815.9517d302-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-expat-2.2.9-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-9.3.0-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-9.3.0-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-9.3.0-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-9.3.0-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-9.3.0-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-9.3.0-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-9.3.0-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-9.3.0-2-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gettext-0.19.8.1-8-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.0-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-8.0.0.5685.ef310786-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-8.0.0.5815.9517d302-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-isl-0.22.1-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-8.0.0.5680.0df6b89f-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-8.0.0.5814.9dbf4cc1-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-make-4.3-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.1.0-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.0.2-2-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-pkg-config-0.29.2-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-windows-default-manifest-6.4-3-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-8.0.0.5680.0df6b89f-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-7-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libsystre-1.0.1-4-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtre-git-r128.6fb7206-2-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtasn1-4.16.0-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-p11-kit-0.23.20-2-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ca-certificates-20190110-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openssl-1.1.1.g-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-termcap-1.3.1-5-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpdecimal-2.4.2-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-bzip2-1.0.8-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-sqlite3-3.31.1-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libffi-3.3-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ncurses-6.2-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.2-2-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.0.004-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-xxhash-0.7.3-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gdb-9.1-3-any.pkg.tar.xz"
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-8.0.0.5814.9dbf4cc1-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-7-any.pkg.tar.xz"
             ],
             "hash": [
                 "c2c23fc704639f0e30a6aa094130f12028fd722d5961ef29df503f241d0bd93e",
-                "280cba536d752b8127d98f32598a537753ecf810e41710342b1ffac5a911316c",
+                "b2c79727807bf1c13881dbc5cc49617105e317cfff8a4e946d420163048fccb5",
                 "04ee9cc360b1aefb3729fec475001e1d35d94979a7dea1e604ac56015216df99",
-                "1f236bdc1894e10aebc1b65dd9847aab3a36712cc2243cacd1c5effc57608ee1",
-                "aebfb0daaac1bdb223c8b2c8dfbc8df3640fee62519e50070689758fe4c9a6c5",
-                "5ff88897cd262df5bc6ac631e8fb334f71748e8c63efe82dd32b66a13b9dc5af",
-                "84bed78b080225ef8c7e5ac000df2b929bd1aac42bf843919a792f7197364511",
+                "29ccb0030d1dae9fd194bb5bc76ba7330a7478b0afe1b2c0c19419a59c0980ef",
+                "228f8cb9ef89806fd96aba00d814d1f038e7ef84e5926730b427d79b5f225b73",
+                "c88596218c06622ee22df85bbd2f5b7e6fb99ea86f946d5f98f9c24b97f92dd0",
+                "596749645071942369ce93266f7622d64d53daf1cd509ca3b86782add9ef714a",
                 "0349bd137cd15ec2e3e882b1b8152ffc4bc5369999b0aa1999c6b087c34148bc",
                 "5cb1a3b31c95cfb0c9dafa93b2898479ac660e5ac931be54f7dddc8e726f98d0",
-                "9b2cb6f16fc379354570ba6409003c12f745f1d10d8f9084162c5adadc847791",
+                "cbe0b0a1af6c46ff2bf3f4cc8f96e73c862a2b11781bd21d6e10cbb4fba587da",
                 "202d28c4d0eeb38837afa39c157c3c1c046ae313641e1a348e1ff60787d447da",
                 "b37b013727b16a90095deb90cecdc073c5bb8dde26886448e2cbf357b29c1271",
-                "a4cb775f275e13c2114d3c4c94e77fc5985e189d8ed40f3d7cf999a9a5b5d478",
+                "35d49b330e55c347644e4c0a8d8ce0886ae6b005c0ab1b0bb28bbcf563754704",
                 "7863472b0763a1a6ca70bdcc6e98df3b2016b221c9da5fe264b28d1c6e1c236c",
                 "d7c59f4e347a86e1cf1c539277fd3e43096846642b1cdf764cae1a8a4e783374",
                 "322712f92173473913b3199988301c3b32639289a4410ba31e732e54bacf3143",
                 "f69c6a4f83164db254178821009e69877855a5dfbfc6b7c5a796cb79964ddaf0",
                 "6c0ea4adcef503dc8174e9d4d70a10aee8295d620db4494f78fa512df0589dcf",
-                "0a28e994a8fb25bc2d55de41d5db893363e0b1e98f9ac1c0db07716b386b3a5c",
-                "1decf05b8ae6ab10ddc9035929014837c18dd76da825329023da835aec53cec2",
-                "c1b9ae045e24a91f261dc654d390ac63254d0ca5882d76b52d7722a9d49fef0c",
-                "fd2c0e426a85c4193d34eea19411166495cb2fde58d0fac4e85422399062e336",
-                "d0bb869cc2e8ef3b2696e3a2288e286503749d23b4a1789e2027d123c2f3f12b",
-                "aaa8535da572d29227c5299bc2c2168a3802a4dcaaa9ea40cb6425b00c99c309",
-                "b88d18f030d81aa637042ee6c5adec02c69cb5a3a1d03600bafa80958fa94bf2",
-                "8e18dbfadb4261fd0882ef8edb7eb58d9129d31d8d9921a4431e55dc7b33fd10",
-                "93d369ef5ed802dc041e570f27a352247c209dad88a6fa1f8d90106d4f8e79a7",
-                "3e40d68e794d0390857e9a3dc808e42e4b48c13d2807081343fd07a07fbf14f9",
-                "cedb53a160aa2aa57e2e231e34e626241db0bf72116d06ed77d0a447c36bf6c6",
-                "7ec12a527edc44f06a751e894baf68b570884b4eca5d97df0d88a196f3d7aca6",
-                "ad933888ccf421e341fa6de179c66ba40ea509f8c4f9c4e55d2b9c9039445017",
-                "7c8b6ae5f2d567785c61f3e5752d8085cb8a45100c4e24250e11a1668931f94b",
-                "47fe3be25879151677e9827e08eb3d17eb97cf4d3508163fb92b352052cb0432",
-                "cbad5350c3f92ad3092e4a178d7f2b522e4f033e62c35ee6ccf10633a6e4f80b",
-                "056ecc41369a1c13b10365b35169b4fed5dba2f08d3ca414c88d7e7fc9e791df",
-                "d1ccb1a5ab8e6eb83f7ca4561ccfe45e1dd4630a343c50b2722c22c01279873f"
+                "9c8a641161971830f65503b45b0307a691fb13736815f7fdc30988dee07feb01",
+                "1decf05b8ae6ab10ddc9035929014837c18dd76da825329023da835aec53cec2"
             ],
             "pre_install": [
-                "Move-Item -Path \"$dir\\mingw64\\*\" -Destination \"$dir\"",
-                "Remove-Item -Path \"$dir\\mingw64\", \"$dir\\.*\""
+                "Move-Item \"$dir\\mingw64\\*\" \"$dir\"",
+                "Remove-Item \"$dir\\mingw64\", \"$dir\\.*\""
             ],
             "post_install": [
-                "New-Item \"$dir\\bin\\bak\" -ItemType \"directory\"",
-                "Move-Item -Path \"$dir\\bin\\python*.exe\" -Destination \"$dir\\bin\\bak\""
+                "ensure \"$dir\\bin\\bak\" | Out-Null",
+                "Move-Item \"$dir\\bin\\python*.exe\" \"$dir\\bin\\bak\""
             ]
         },
         "32bit": {
             "url": [
                 "http://repo.msys2.org/mingw/i686/mingw-w64-i686-binutils-2.34-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-8.0.0.5685.ef310786-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-8.0.0.5815.9517d302-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/i686/mingw-w64-i686-expat-2.2.9-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-9.3.0-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-9.3.0-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-9.3.0-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-9.3.0-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-9.3.0-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-9.3.0-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-9.3.0-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-9.3.0-2-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gettext-0.19.8.1-8-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gmp-6.2.0-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-8.0.0.5685.ef310786-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-8.0.0.5815.9517d302-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/i686/mingw-w64-i686-isl-0.22.1-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libiconv-1.16-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-8.0.0.5680.0df6b89f-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-8.0.0.5814.9dbf4cc1-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/i686/mingw-w64-i686-make-4.3-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/i686/mingw-w64-i686-mpc-1.1.0-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/i686/mingw-w64-i686-mpfr-4.0.2-2-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-0.29.2-1-any.pkg.tar.xz",
                 "http://repo.msys2.org/mingw/i686/mingw-w64-i686-windows-default-manifest-6.4-3-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-8.0.0.5680.0df6b89f-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-7-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libsystre-1.0.1-4-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libtre-git-r128.6fb7206-2-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libtasn1-4.16.0-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-p11-kit-0.23.20-2-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-ca-certificates-20190110-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-openssl-1.1.1.g-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-termcap-1.3.1-5-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-mpdecimal-2.4.2-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-bzip2-1.0.8-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-sqlite3-3.31.1-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libffi-3.3-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-ncurses-6.2-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-python-3.8.2-2-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-readline-8.0.004-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-xxhash-0.7.3-1-any.pkg.tar.xz",
-                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gdb-9.1-3-any.pkg.tar.xz"
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-8.0.0.5814.9dbf4cc1-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-7-any.pkg.tar.xz"
             ],
             "hash": [
                 "234396201fb4078ef8463497c04151c7826f0313dcb4b40c9b82aea3a282e819",
-                "e06d7889a222182ac745a85435544dee951ba59ac29217a65236f3e9cbebd765",
+                "15809600cdd409e83b75e9a937c6c32c5b81b236f394f1880800785cf7fa08ca",
                 "37dfa72246fd2478b991c93b5cce930b872420d6785fe7605458b472472134d8",
-                "181728706f67f9ed5683e96dab903d4f9414410464cd57df109fcc1741920431",
-                "8eea145827de9961fa5da0da3a215b5dbba6ed5dbf76aec77eda0b9473f69c82",
-                "a7125f82ea9df7def887d40ddd186e92d0dd08b6b8c51afe374b0df32781de9e",
-                "d5b2b3117b3127a719a2d2aa2b142b3f440d5b3cf207705f20c78c8d96615584",
+                "2b0cb084cec8dcd63f893901007be3f70e3584e44a9f4f9dbb381905a4105d5e",
+                "3751e3f3878e979b9b49346ad3105499d6ca2da737db6bfb35663ac72c514f3d",
+                "66ee1a681d31b581c0450d57b06aa8e4f2ee6ce5a63db53041884f0b498d7f25",
+                "01b5f6e44b10be52a926b651a75d5d8137dafc27550915c24818023039ab1985",
                 "c1b3f4ea1a5c71b944bd0a71d2c2f6a36c38a5762a2b193bc4facf75c33d9c7a",
                 "3bf4783aed8e705fe9be132feced44d7097180d825367bc2b46fe45c39d2b701",
-                "1ab69f7d69898e09bedfadd40027eae7ec4723c19a2dffcf6b6a82be9d7f3288",
+                "d0b9419f8a1d858d99feaa7447a0ad28e48328a978ce8269ece612abc08dae8b",
                 "7e6f75306aec44e3351aa1ae0adb9eed892d99dd552d564a903e9200474a0599",
                 "bbd79d5059f116e8f4b8dd26ca661f384eee1082b265389dbfa364d316eea334",
-                "a550b3412f88fe3e00e5b982a45aa850f728619dcd7095442106418544374066",
+                "df7d70010f7e1443ede50887430352ddf15787cf6d8cb39bec2f4f36a3d5e5c5",
                 "49a9bd81fe265fd969618f9ffee9926a92193cc86d409cb1988f35a4dad3fe79",
                 "599a0276820e3d342d1c494c4506aaf79fbbbc2843bbec7aae5f22a1b71da284",
                 "7ba5ed9c5e535fdc619138278fff0567dad39b9251d5dc5c4d708ab6f345146e",
                 "39e07e61d739ba8f066605a109a19db397be6f7ddd81e5172f49ed253fdbe49f",
                 "56323bc39c7de0ff727915c09c4aaa25b8396efc0d7eda0006d5951bb6a6b983",
-                "e69339fda92b19469d5a4e0a1d5f50af8d8a420dc66f823d653ac8b536240493",
-                "addf6c52134027407640f1cbdf4efc5b64430f3a286cb4e4c4f5dbb44ce55a42",
-                "3a400210f7f366c63d000d910203257643b4de1409d09d12da86e76acb4dd407",
-                "cc8ec470688c20d7b6da4ccc5dbaa275edb20242a058041b3b62a1b795ab8048",
-                "62ff113c03ff10b93763818cd603bfca50ad6f32b1ce3b1b0ccd1a51009b6384",
-                "aa4b1f6b64e690d1ffa8207f3a22e067e82651b08d877b0394e1ebfdfa9a3dcd",
-                "55e5c8c36fc0c62afc83f1d5dc6fcc6623643f50fc130d31b2b1d4483929af7d",
-                "6e3434019a7acebcf344489718a35ec40b815e67a6cd4f9b8dd3980d1c6f4f9d",
-                "70387a50939c3c9ad891d7f92e0a9ae92a4b30144303e55144c864b3a6ed49ce",
-                "5c1c64552a680b6e222751a732b724e62de5ee7b511190e81b2dd252c64807df",
-                "598bbaba996ed920a0d210c8182edbdf73a9df33b0c80b20fad1fb4a06a3fed0",
-                "af28533cd56fb615a1cfce499a61514f031504fb4fdc51ff1920f852ad500267",
-                "5bc5811941e88522cdd5fc255b724b0f444feb6c59ccf9f10ad35a0ed62124b0",
-                "822345fe69818dae56d80260e010ebc53e4472e3ca05a8a6ed1988b1425847e0",
-                "e08c7855b32a0b021244ec10ba6aa8cdf8bdf6132dd1606e80e273d10fce1882",
-                "79252f337255054f4ebc34128ca30b2a02bdd1d1018959db4726448d1bdd46e0",
-                "0fb85b09f3aea7a6e6c8dd27bf23d58f36bbb2895c5ca4559ef88c793a62fd87",
-                "db8875055155f0c64c08d025f1b718778f07ab0a6249475f3ae3b46e09d8e956"
+                "554d832117312bdbfbb3840046916670625fa1383d16b25e76941285ff5bc933",
+                "addf6c52134027407640f1cbdf4efc5b64430f3a286cb4e4c4f5dbb44ce55a42"
             ],
             "pre_install": [
-                "Move-Item -Path \"$dir\\mingw32\\*\" -Destination \"$dir\"",
-                "Remove-Item -Path \"$dir\\mingw32\", \"$dir\\.*\""
+                "Move-Item \"$dir\\mingw32\\*\" \"$dir\"",
+                "Remove-Item \"$dir\\mingw32\", \"$dir\\.*\""
             ],
             "post_install": [
-                "New-Item \"$dir\\bin\\bak\" -ItemType \"directory\"",
-                "Move-Item -Path \"$dir\\bin\\python*.exe\" -Destination \"$dir\\bin\\bak\""
+                "ensure \"$dir\\bin\\bak\" | Out-Null",
+                "Move-Item \"$dir\\bin\\python*.exe\" \"$dir\\bin\\bak\""
             ]
         }
     },
diff --git a/bucket/gdb.json b/bucket/gdb.json
index 4cf336ee68..613cdc4640 100644
--- a/bucket/gdb.json
+++ b/bucket/gdb.json
@@ -1,19 +1,144 @@
 {
-    "homepage": "http://tdm-gcc.tdragon.net/",
-    "description": "GDB, the GNU Project debugger, allows you to see what is going on `inside' another program while it executes -- or what another program was doing at the moment it crashed. (TDM port)",
-    "version": "7.9.1",
-    "license": "GPL-2.0-only|GPL-3.0-only",
+    "version": "9.1-3",
+    "description": "GNU Debugger (Mingw-w64 port from MSYS2 project)",
+    "homepage": "https://mingw-w64.org",
+    "license": "GPL-3.0-or-later",
     "architecture": {
         "64bit": {
-            "url": "https://downloads.sourceforge.net/project/tdm-gcc/GDB/gdb-7.9.1-tdm64-2.zip",
-            "hash": "89186aa83143f47902b52f5673dd32421ec9c221e53e3227fd065a7e86c8c6f5",
-            "extract_dir": "gdb64"
+            "url": [
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-bzip2-1.0.8-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ca-certificates-20190110-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-expat-2.2.9-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-9.3.0-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gdb-9.1-3-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gettext-0.19.8.1-8-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.0-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libffi-3.3-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libsystre-1.0.1-4-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtasn1-4.16.0-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtre-git-r128.6fb7206-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-8.0.0.5814.9dbf4cc1-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.1.0-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpdecimal-2.4.2-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.0.2-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ncurses-6.2-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openssl-1.1.1.g-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-p11-kit-0.23.20-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.2-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.0.004-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-sqlite3-3.31.1-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.10-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-termcap-1.3.1-5-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.10-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-xxhash-0.7.3-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-xz-5.2.5-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-7-any.pkg.tar.xz"
+            ],
+            "hash": [
+                "cedb53a160aa2aa57e2e231e34e626241db0bf72116d06ed77d0a447c36bf6c6",
+                "b88d18f030d81aa637042ee6c5adec02c69cb5a3a1d03600bafa80958fa94bf2",
+                "04ee9cc360b1aefb3729fec475001e1d35d94979a7dea1e604ac56015216df99",
+                "596749645071942369ce93266f7622d64d53daf1cd509ca3b86782add9ef714a",
+                "d1ccb1a5ab8e6eb83f7ca4561ccfe45e1dd4630a343c50b2722c22c01279873f",
+                "0349bd137cd15ec2e3e882b1b8152ffc4bc5369999b0aa1999c6b087c34148bc",
+                "5cb1a3b31c95cfb0c9dafa93b2898479ac660e5ac931be54f7dddc8e726f98d0",
+                "ad933888ccf421e341fa6de179c66ba40ea509f8c4f9c4e55d2b9c9039445017",
+                "b37b013727b16a90095deb90cecdc073c5bb8dde26886448e2cbf357b29c1271",
+                "c1b9ae045e24a91f261dc654d390ac63254d0ca5882d76b52d7722a9d49fef0c",
+                "d0bb869cc2e8ef3b2696e3a2288e286503749d23b4a1789e2027d123c2f3f12b",
+                "fd2c0e426a85c4193d34eea19411166495cb2fde58d0fac4e85422399062e336",
+                "35d49b330e55c347644e4c0a8d8ce0886ae6b005c0ab1b0bb28bbcf563754704",
+                "d7c59f4e347a86e1cf1c539277fd3e43096846642b1cdf764cae1a8a4e783374",
+                "3e40d68e794d0390857e9a3dc808e42e4b48c13d2807081343fd07a07fbf14f9",
+                "322712f92173473913b3199988301c3b32639289a4410ba31e732e54bacf3143",
+                "7c8b6ae5f2d567785c61f3e5752d8085cb8a45100c4e24250e11a1668931f94b",
+                "8e18dbfadb4261fd0882ef8edb7eb58d9129d31d8d9921a4431e55dc7b33fd10",
+                "aaa8535da572d29227c5299bc2c2168a3802a4dcaaa9ea40cb6425b00c99c309",
+                "47fe3be25879151677e9827e08eb3d17eb97cf4d3508163fb92b352052cb0432",
+                "cbad5350c3f92ad3092e4a178d7f2b522e4f033e62c35ee6ccf10633a6e4f80b",
+                "7ec12a527edc44f06a751e894baf68b570884b4eca5d97df0d88a196f3d7aca6",
+                "db48f5916134c5342cb1f137c48386f69e1458dbfae24e7a4b0626e44e56072d",
+                "93d369ef5ed802dc041e570f27a352247c209dad88a6fa1f8d90106d4f8e79a7",
+                "912add81c65fc4cadc47c0445b94d87f89215ccbd67a5e062f2a92dfc6701358",
+                "056ecc41369a1c13b10365b35169b4fed5dba2f08d3ca414c88d7e7fc9e791df",
+                "4f9e3dba11c56cf3f3406117c792c6899013984c330ce8d21f33678bfcc50726",
+                "1decf05b8ae6ab10ddc9035929014837c18dd76da825329023da835aec53cec2"
+            ],
+            "pre_install": [
+                "Move-Item \"$dir\\mingw64\\*\" \"$dir\"",
+                "Remove-Item \"$dir\\mingw64\", \"$dir\\.*\""
+            ]
         },
         "32bit": {
-            "url": "https://downloads.sourceforge.net/project/tdm-gcc/GDB/gdb32-7.9.1-tdm-1.zip",
-            "hash": "715604034bb269ecbfaf4577addac51b8ba798f93b2eca31cb21b114b7bc46e8",
-            "extract_dir": "gdb32"
+            "url": [
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-bzip2-1.0.8-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-ca-certificates-20190110-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-expat-2.2.9-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-9.3.0-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gdb-9.1-3-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gettext-0.19.8.1-8-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-gmp-6.2.0-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libffi-3.3-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libiconv-1.16-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libsystre-1.0.1-4-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libtasn1-4.16.0-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libtre-git-r128.6fb7206-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-8.0.0.5814.9dbf4cc1-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-mpc-1.1.0-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-mpdecimal-2.4.2-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-mpfr-4.0.2-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-ncurses-6.2-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-openssl-1.1.1.g-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-p11-kit-0.23.20-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-python-3.8.2-2-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-readline-8.0.004-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-sqlite3-3.31.1-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-tcl-8.6.10-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-termcap-1.3.1-5-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-tk-8.6.10-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-xxhash-0.7.3-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-xz-5.2.5-1-any.pkg.tar.xz",
+                "http://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-7-any.pkg.tar.xz"
+            ],
+            "hash": [
+                "598bbaba996ed920a0d210c8182edbdf73a9df33b0c80b20fad1fb4a06a3fed0",
+                "55e5c8c36fc0c62afc83f1d5dc6fcc6623643f50fc130d31b2b1d4483929af7d",
+                "37dfa72246fd2478b991c93b5cce930b872420d6785fe7605458b472472134d8",
+                "01b5f6e44b10be52a926b651a75d5d8137dafc27550915c24818023039ab1985",
+                "db8875055155f0c64c08d025f1b718778f07ab0a6249475f3ae3b46e09d8e956",
+                "c1b3f4ea1a5c71b944bd0a71d2c2f6a36c38a5762a2b193bc4facf75c33d9c7a",
+                "3bf4783aed8e705fe9be132feced44d7097180d825367bc2b46fe45c39d2b701",
+                "5bc5811941e88522cdd5fc255b724b0f444feb6c59ccf9f10ad35a0ed62124b0",
+                "bbd79d5059f116e8f4b8dd26ca661f384eee1082b265389dbfa364d316eea334",
+                "3a400210f7f366c63d000d910203257643b4de1409d09d12da86e76acb4dd407",
+                "62ff113c03ff10b93763818cd603bfca50ad6f32b1ce3b1b0ccd1a51009b6384",
+                "cc8ec470688c20d7b6da4ccc5dbaa275edb20242a058041b3b62a1b795ab8048",
+                "df7d70010f7e1443ede50887430352ddf15787cf6d8cb39bec2f4f36a3d5e5c5",
+                "599a0276820e3d342d1c494c4506aaf79fbbbc2843bbec7aae5f22a1b71da284",
+                "5c1c64552a680b6e222751a732b724e62de5ee7b511190e81b2dd252c64807df",
+                "7ba5ed9c5e535fdc619138278fff0567dad39b9251d5dc5c4d708ab6f345146e",
+                "822345fe69818dae56d80260e010ebc53e4472e3ca05a8a6ed1988b1425847e0",
+                "6e3434019a7acebcf344489718a35ec40b815e67a6cd4f9b8dd3980d1c6f4f9d",
+                "aa4b1f6b64e690d1ffa8207f3a22e067e82651b08d877b0394e1ebfdfa9a3dcd",
+                "e08c7855b32a0b021244ec10ba6aa8cdf8bdf6132dd1606e80e273d10fce1882",
+                "79252f337255054f4ebc34128ca30b2a02bdd1d1018959db4726448d1bdd46e0",
+                "af28533cd56fb615a1cfce499a61514f031504fb4fdc51ff1920f852ad500267",
+                "6a3c86d1220e20e3cc452fac38f1b3887f6e79889844740bad9c71b169409cfb",
+                "70387a50939c3c9ad891d7f92e0a9ae92a4b30144303e55144c864b3a6ed49ce",
+                "4349d1f6394901541feff052a4ac5b2b465be736c0b3dde90d5cf293271ad4b5",
+                "0fb85b09f3aea7a6e6c8dd27bf23d58f36bbb2895c5ca4559ef88c793a62fd87",
+                "7d8cae7e18c72f2ba83cbc5a98c62a68f016c03980d4f6692ea343c271078d4f",
+                "addf6c52134027407640f1cbdf4efc5b64430f3a286cb4e4c4f5dbb44ce55a42"
+            ],
+            "pre_install": [
+                "Move-Item \"$dir\\mingw32\\*\" \"$dir\"",
+                "Remove-Item \"$dir\\mingw32\", \"$dir\\.*\""
+            ]
         }
     },
-    "env_add_path": "bin"
+    "bin": [
+        "bin\\gdb.exe",
+        "bin\\gdbserver.exe"
+    ]
 }
diff --git a/bucket/intermodal.json b/bucket/intermodal.json
new file mode 100644
index 0000000000..466bce88d9
--- /dev/null
+++ b/bucket/intermodal.json
@@ -0,0 +1,21 @@
+{
+    "version": "0.1.12",
+    "description": "User-friendly and featureful command-line BitTorrent metainfo utility",
+    "homepage": "https://github.com/casey/intermodal",
+    "license": "CC0-1.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/casey/intermodal/releases/download/v0.1.12/imdl-v0.1.12-x86_64-pc-windows-msvc.zip",
+            "hash": "86dba0c9426f81284f61443f45e5b804c7718a11aa770aed0855d181a70fda88"
+        }
+    },
+    "bin": "imdl.exe",
+    "checkver": "github",
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/casey/intermodal/releases/download/v$version/imdl-v$version-x86_64-pc-windows-msvc.zip"
+            }
+        }
+    }
+}
diff --git a/bucket/latexindent.json b/bucket/latexindent.json
new file mode 100644
index 0000000000..399413cf83
--- /dev/null
+++ b/bucket/latexindent.json
@@ -0,0 +1,17 @@
+{
+    "version": "3.8.2",
+    "description": "Perl script to add indentation to LaTeX files",
+    "homepage": "https://github.com/cmhughes/latexindent.pl",
+    "license": "GPL-3.0-only",
+    "url": "http://mirrors.ctan.org/support/latexindent.zip",
+    "hash": "ea4a6b3dc0873213b6fdda128ab2d1b8a0478d46f1be8a23dc23f98ca848c898",
+    "extract_dir": "latexindent",
+    "bin": "latexindent.exe",
+    "checkver": {
+        "url": "https://ctan.org/pkg/latexindent",
+        "regex": "Version</td><td>([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "http://mirrors.ctan.org/support/latexindent.zip"
+    }
+}
diff --git a/bucket/lua.json b/bucket/lua.json
index 8b16d83775..a1aa460d49 100644
--- a/bucket/lua.json
+++ b/bucket/lua.json
@@ -1,26 +1,26 @@
 {
-    "homepage": "http://www.lua.org/",
-    "version": "5.4.0",
-    "license": "MIT",
+    "version": "5.4.1",
     "description": "A powerful, efficient, lightweight, embeddable scripting language",
+    "homepage": "http://www.lua.org",
+    "license": "MIT",
     "architecture": {
         "64bit": {
             "url": [
-                "https://joedf.ahkscript.org/LuaBuilds/hdata/lua-5.4.0_Win64_bin.zip",
+                "https://joedf.ahkscript.org/LuaBuilds/hdata/lua-5.4.1_Win64_bin.zip",
                 "https://joedf.ahkscript.org/LuaBuilds/hdata/libgcc_s_dw2-1.dll.zip"
             ],
             "hash": [
-                "8A28E57A70D8EB44AA6F3EB87390D36A3C9F37A867B0EDD99C7D3ED4CA28C8E7",
+                "0faeda4e64113fbfd288e7a12ce58aeaf92e01c2256340a5ae4bb8b617e8461f",
                 "546204ef8af80565b051b0d5dec2d885ae524cf060f99683e038e4b49b60d9e5"
             ]
         },
         "32bit": {
             "url": [
-                "https://joedf.ahkscript.org/LuaBuilds/hdata/lua-5.4.0_Win32_bin.zip",
+                "https://joedf.ahkscript.org/LuaBuilds/hdata/lua-5.4.1_Win32_bin.zip",
                 "https://joedf.ahkscript.org/LuaBuilds/hdata/libgcc_s_dw2-1.dll.zip"
             ],
             "hash": [
-                "73C5CBE6DE6702341E0258C0E70FC801D3715B104EEF27C7F953D2C7E5A3DBDF",
+                "720167e8786b2356f1c7371fedca80413896c10192bdaac007ffab0a899a8910",
                 "546204ef8af80565b051b0d5dec2d885ae524cf060f99683e038e4b49b60d9e5"
             ]
         }
@@ -31,6 +31,16 @@
     ],
     "checkver": {
         "url": "https://joedf.ahkscript.org/LuaBuilds/",
-        "regex": "Lua ([\\d.]+) for Windows"
+        "regex": "Lua ([\\d.]+(-[\\w]+)?)"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://joedf.ahkscript.org/LuaBuilds/hdata/lua-$version_Win64_bin.zip"
+            },
+            "32bit": {
+                "url": "https://joedf.ahkscript.org/LuaBuilds/hdata/lua-$version_Win32_bin.zip"
+            }
+        }
     }
 }
diff --git a/bucket/postgresql.json b/bucket/postgresql.json
index 3fbfdb4998..5127b00484 100644
--- a/bucket/postgresql.json
+++ b/bucket/postgresql.json
@@ -1,5 +1,5 @@
 {
-    "version": "12.4",
+    "version": "13.0",
     "description": "Object-relational database management system based on POSTGRES.",
     "homepage": "https://www.postgresql.org",
     "license": "PostgreSQL",
@@ -10,8 +10,8 @@
     ],
     "architecture": {
         "64bit": {
-            "url": "https://get.enterprisedb.com/postgresql/postgresql-12.4-1-windows-x64-binaries.zip",
-            "hash": "58b4d61623556db88a24d6551026c93ce7d96f102b8872b60e1a2091d93cc442"
+            "url": "https://get.enterprisedb.com/postgresql/postgresql-13.0-1-windows-x64-binaries.zip",
+            "hash": "b09d77804539ee38f1ea89276e122f91444d1df2b5c72e07ac05434d1ad19f28"
         }
     },
     "extract_dir": "pgsql",
diff --git a/bucket/puppet-bolt.json b/bucket/puppet-bolt.json
index 3ead3f056f..d9e5453931 100644
--- a/bucket/puppet-bolt.json
+++ b/bucket/puppet-bolt.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://puppet.com/open-source/bolt",
-    "description": "Orchestration and agentless IT automation",
     "version": "2.31.0",
+    "description": "Orchestration and agentless IT automation",
+    "homepage": "https://puppet.com/open-source/bolt",
     "license": "Apache-2.0",
     "architecture": {
         "64bit": {
@@ -10,6 +10,12 @@
         }
     },
     "extract_dir": "Puppet Labs\\Bolt",
+    "post_install": [
+        "if (Test-Path \"$dir\\share\\install-tarballs\\ruby*.tgz\") {",
+        "   info 'Extract tarball of gems...'",
+        "   Expand-7zipArchive \"$dir\\share\\install-tarballs\\ruby*.tgz\" \"$dir\" -Removal",
+        "}"
+    ],
     "bin": "bin\\bolt.bat",
     "checkver": {
         "url": "https://downloads.puppetlabs.com/windows/puppet/index_by_lastModified_reverse.html",
diff --git a/bucket/srlua.json b/bucket/srlua.json
index 2f63169e1e..66602b5373 100644
--- a/bucket/srlua.json
+++ b/bucket/srlua.json
@@ -1,36 +1,46 @@
 {
     "homepage": "https://github.com/LuaDist/srlua",
-    "version": "5.3.5",
+    "version": "5.4.1",
     "license": "MIT",
     "description": "A tool for building self-running Lua programs",
     "architecture": {
         "64bit": {
             "url": [
-                "https://joedf.ahkscript.org/LuaBuilds/hdata/srlua-5.3.5_Win64_bin.zip",
+                "https://joedf.ahkscript.org/LuaBuilds/hdata/srlua-5.4.1_Win64_bin.zip",
                 "https://joedf.ahkscript.org/LuaBuilds/hdata/libgcc_s_dw2-1.dll.zip"
             ],
             "hash": [
-                "c2bc41a326e2b0e65331be78e91fad08963e52b2cb6a995966ff0f5d5f1c522d",
+                "b76d9f41ae6962aea5e53afa456b708d2443e98a57dae92ddb343e1051a1fa7a",
                 "546204ef8af80565b051b0d5dec2d885ae524cf060f99683e038e4b49b60d9e5"
             ]
         },
         "32bit": {
             "url": [
-                "https://joedf.ahkscript.org/LuaBuilds/hdata/srlua-5.3.5_Win32_bin.zip",
+                "https://joedf.ahkscript.org/LuaBuilds/hdata/srlua-5.4.1_Win32_bin.zip",
                 "https://joedf.ahkscript.org/LuaBuilds/hdata/libgcc_s_dw2-1.dll.zip"
             ],
             "hash": [
-                "8e95a19fbf57a38f30433317d873556f03e2e1bcc5f471e64f8d6fdfb3c2bc97",
+                "ea442c1faf2e5e5ab49989f4d11635715a3d8626594bc2f57bb52c1d773bbc2d",
                 "546204ef8af80565b051b0d5dec2d885ae524cf060f99683e038e4b49b60d9e5"
             ]
         }
     },
     "bin": [
         "srlua.exe",
-        "glue.exe"
+        "srglue.exe"
     ],
     "checkver": {
         "url": "https://joedf.ahkscript.org/LuaBuilds/",
-        "regex": "Lua ([\\d.]+) for Windows"
+        "regex": "Lua ([\\d.]+(-[\\w]+)?)"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://joedf.ahkscript.org/LuaBuilds/hdata/srlua-$version_Win64_bin.zip"
+            },
+            "32bit": {
+                "url": "https://joedf.ahkscript.org/LuaBuilds/hdata/srlua-$version_Win32_bin.zip"
+            }
+        }
     }
 }
diff --git a/bucket/tektoncd-cli.json b/bucket/tektoncd-cli.json
index 73440c2a33..1f4c2ee986 100644
--- a/bucket/tektoncd-cli.json
+++ b/bucket/tektoncd-cli.json
@@ -1,12 +1,12 @@
 {
-    "version": "0.13.0",
+    "version": "0.13.1",
     "description": "A CLI for interacting with Tekton - a cloud native CI/CD solution",
     "homepage": "https://github.com/tektoncd/cli",
     "license": "Apache-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/tektoncd/cli/releases/download/v0.13.0/tkn_0.13.0_Windows_x86_64.zip",
-            "hash": "72ed00bdc35c53ab6e69ccf606e92043cdc446c0b59b6ad90f84f14b1072efbc"
+            "url": "https://github.com/tektoncd/cli/releases/download/v0.13.1/tkn_0.13.1_Windows_x86_64.zip",
+            "hash": "4057a6b44d3ac9570d58b174d4dbda9849a1ff2e7cb364a9bc76af9ceeb60166"
         }
     },
     "bin": "tkn.exe",
diff --git a/bucket/vulkan.json b/bucket/vulkan.json
index 453725e4bc..df04d07658 100644
--- a/bucket/vulkan.json
+++ b/bucket/vulkan.json
@@ -28,7 +28,8 @@
         }
     },
     "env_set": {
-        "VULKAN_SDK": "$persist_dir\\scoop\\apps\\vulkan\\current"
+        "VULKAN_SDK": "$dir",
+        "VK_SDK_PATH": "$dir"
     },
     "checkver": {
         "url": "https://vulkan.lunarg.com/sdk/home.dhtml",
diff --git a/bucket/waypoint.json b/bucket/waypoint.json
new file mode 100644
index 0000000000..138d391798
--- /dev/null
+++ b/bucket/waypoint.json
@@ -0,0 +1,34 @@
+{
+    "version": "0.1.3",
+    "description": "Tool for defining application's build, deploy, and release lifecycle as code, reducing the time to deliver deployments through a consistent and repeatable workflow.",
+    "homepage": "https://www.waypointproject.io",
+    "license": "MPL-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://releases.hashicorp.com/waypoint/0.1.3/waypoint_0.1.3_windows_amd64.zip",
+            "hash": "8d9c1aee90be23ad6e8b394a9ebbb038388cd8553bb15bb5852941f212ec1442"
+        },
+        "32bit": {
+            "url": "https://releases.hashicorp.com/waypoint/0.1.3/waypoint_0.1.3_windows_386.zip",
+            "hash": "0a63adadce21d864fc49c3bc3e77fb08cd8da182a82d8cb85cd67abcc32d4691"
+        }
+    },
+    "bin": "waypoint.exe",
+    "checkver": {
+        "url": "https://releases.hashicorp.com/waypoint/",
+        "regex": "waypoint_([\\d.]+)</a>"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://releases.hashicorp.com/waypoint/$version/waypoint_$version_windows_amd64.zip"
+            },
+            "32bit": {
+                "url": "https://releases.hashicorp.com/waypoint/$version/waypoint_$version_windows_386.zip"
+            }
+        },
+        "hash": {
+            "url": "$baseurl/waypoint_$version_SHA256SUMS"
+        }
+    }
+}
diff --git a/bucket/wkhtmltopdf.json b/bucket/wkhtmltopdf.json
index 04aab3c08e..af151d2e9b 100644
--- a/bucket/wkhtmltopdf.json
+++ b/bucket/wkhtmltopdf.json
@@ -1,34 +1,34 @@
 {
-    "homepage": "https://wkhtmltopdf.org/",
-    "version": "0.12.5-1",
+    "version": "0.12.6-1",
     "description": "Render HTML into PDF",
+    "homepage": "https://wkhtmltopdf.org/",
     "license": "LGPL-3.0-only",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.mxe-cross-win64.7z",
-            "hash": "d9c4717318439f7576ce201de145f0b71ffdd209faadec8dcfb1be088eae6e71"
+            "url": "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.mxe-cross-win64.7z",
+            "hash": "6ce994c89d5f6018fa158e149a2de8fbbbeb14d8ff5cb656c89893bc556e0557"
         },
         "32bit": {
-            "url": "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.mxe-cross-win32.7z",
-            "hash": "eb00f88ceed2941430cb05bc91da4e753e2319188b8e891735ad141aad668ae8"
+            "url": "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.mxe-cross-win32.7z",
+            "hash": "073f2918339e6e0cd4119f7fdb9dc4c68dc7196b4d8be9a57e47a381408d1fae"
         }
     },
-    "extract_dir": "wkhtmltox/bin",
+    "extract_dir": "wkhtmltox\\bin",
     "bin": [
         "wkhtmltoimage.exe",
         "wkhtmltopdf.exe"
     ],
     "checkver": {
-        "url": "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/latest",
-        "re": "releases/download/(?<head>[0-9.]+)/wkhtmltox-(?<version>[0-9.-]+)\\.mxe-cross-"
+        "url": "https://github.com/wkhtmltopdf/packaging/releases",
+        "regex": "/wkhtmltox-([\\d.-]+)\\.mxe-cross-"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/$matchHead/wkhtmltox-$version.mxe-cross-win64.7z"
+                "url": "https://github.com/wkhtmltopdf/packaging/releases/download/$version/wkhtmltox-$version.mxe-cross-win64.7z"
             },
             "32bit": {
-                "url": "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/$matchHead/wkhtmltox-$version.mxe-cross-win32.7z"
+                "url": "https://github.com/wkhtmltopdf/packaging/releases/download/$version/wkhtmltox-$version.mxe-cross-win32.7z"
             }
         },
         "hash": {
diff --git a/bucket/x265.json b/bucket/x265.json
new file mode 100644
index 0000000000..29402d670a
--- /dev/null
+++ b/bucket/x265.json
@@ -0,0 +1,36 @@
+{
+    "description": "Encodes video or images into an H.265 / HEVC bitstream.",
+    "homepage": "http://x265.org/",
+    "license": {
+        "identifier": "GPL-2.0 or Commercial",
+        "url": "http://x265.org/x265-licensing-faq/"
+    },
+    "url": "http://msystem.waw.pl/x265/x265-3.4+26-ga82c_vs2019-AVX2.7z",
+    "hash": "3d1dcaf39b871e76867d36f179118a1a2d834cd034939409c6083192477d203b",
+    "version": "3.4+26-ga82c",
+    "architecture": {
+        "64bit": {
+            "bin": [
+                "x265.exe",
+                "x265-8b.exe",
+                "x265-10b.exe",
+                "x265-12b.exe"
+            ]
+        },
+        "32bit": {
+            "bin": [
+                [
+                    "x265_32.exe",
+                    "x265"
+                ]
+            ]
+        }
+    },
+    "checkver": {
+        "url": "http://msystem.waw.pl/x265/",
+        "regex": "x265-([^_]+)_vs2019-AVX2"
+    },
+    "autoupdate": {
+        "url": "http://msystem.waw.pl/x265/x265-$version_vs2019-AVX2.7z"
+    }
+}