diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash
index ec43355451..1c7758afcd 100644
--- a/package/avrdude/avrdude.hash
+++ b/package/avrdude/avrdude.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  2a09913450c6457c3fe8d43d5141de579d4e57d67e593e7399a4cd3768cc60f9  avrdude-r1450-br2.tar.gz
-sha256  201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2  avrdude/COPYING
+sha256  bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6  avrdude-v6.4.tar.gz
+sha256  201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2  COPYING
diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk
index ae623a7929..5bbbc4e8c2 100644
--- a/package/avrdude/avrdude.mk
+++ b/package/avrdude/avrdude.mk
@@ -4,13 +4,12 @@
 #
 ################################################################################
 
-AVRDUDE_VERSION = r1450
-AVRDUDE_SITE_METHOD = svn
-AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk
+AVRDUDE_VERSION = v6.4
+AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION))
 AVRDUDE_LICENSE = GPL-2.0+
-AVRDUDE_LICENSE_FILES = avrdude/COPYING
-AVRDUDE_SUBDIR = avrdude
-# Sources coming from svn, without generated configure and Makefile.in
+AVRDUDE_LICENSE_FILES = COPYING
+
+# Sources coming from git, without generated configure and Makefile.in
 # files.
 AVRDUDE_AUTORECONF = YES
 AVRDUDE_CONF_OPTS = --enable-linuxgpio