diff --git a/bucket/avrdude.json b/bucket/avrdude.json
index be98452568..6bfb643516 100644
--- a/bucket/avrdude.json
+++ b/bucket/avrdude.json
@@ -1,17 +1,17 @@
 {
-    "version": "6.3-20171130",
+    "version": "6.4",
     "description": "AVRDUDE is software for programming Atmel AVR Microcontrollers",
-    "homepage": "https://osdn.net/projects/avrdude",
+    "homepage": "https://github.com/avrdudes/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"
-        }
+    "url": "https://download.savannah.gnu.org/releases/avrdude/avrdude-6.4-mingw32.zip",
+    "hash": "d16d6ec2c721c7622925b27b8ed1536b3fc6f9015c1f22c8b47ac9b19fdb03ed",
+    "bin": "avrdude.exe",
+    "checkver": {
+        "url": "https://download.savannah.gnu.org/releases/avrdude/",
+        "regex": "avrdude-([\\d.]+)-mingw32.zip",
+        "reverse": true
     },
-    "bin": "avrdude.exe"
+    "autoupdate": {
+        "url": "https://download.savannah.gnu.org/releases/avrdude/avrdude-$version-mingw32.zip"
+    }
 }