diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile
index 7f389b7e4606..73c1c491e2f9 100644
--- a/devel/avrdude/Makefile
+++ b/devel/avrdude/Makefile
@@ -1,29 +1,32 @@
 # Created by: Brian Dean <bsd@FreeBSD.org>
 
 PORTNAME=	avrdude
-PORTVERSION=	6.4
+PORTVERSION=	7.0
 CATEGORIES=	devel
-MASTER_SITES=	SAVANNAH/avrdude
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Program for programming the on-chip memory of Atmel AVR CPUs
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-USES=		libtool localbase readline gmake
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
+USES=		libtool localbase readline cmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	avrdudes
+GH_PROJECT=	avrdude
+GH_TAGNAME=	v${PORTVERSION}
 
 OPTIONS_DEFINE=		FTDI PARPORT
 OPTIONS_DEFAULT=	FTDI
 FTDI_DESC=		libftdi support
 FTDI_LIB_DEPENDS=	libftdi1.so:devel/libftdi1
 PARPORT_DESC=		support for parallel-port programmers
 PARPORT_CONFIGURE_ENABLE= parport
 
-post-patch-FTDI-off:
-	@${REINPLACE_CMD} -e '/LIBS=/ s|-lftdi1*|&-do-not-detect|' ${WRKSRC}/configure
+# man page currently not handled by CMake
+# https://github.com/avrdudes/avrdude/issues/947
+post-install:
+	${GZIP_CMD} < ${WRKSRC}/src/avrdude.1 > ${STAGEDIR}/${MANPREFIX}/man/man1/avrdude.1.gz
 
 .include <bsd.port.mk>
diff --git a/devel/avrdude/distinfo b/devel/avrdude/distinfo
index 4862deac360f..5422d70486ef 100644
--- a/devel/avrdude/distinfo
+++ b/devel/avrdude/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639772490
-SHA256 (avrdude-6.4.tar.gz) = a9be7066f70a9dcf4bf0736fcf531db6a3250aed1a24cc643add27641b7110f9
-SIZE (avrdude-6.4.tar.gz) = 986871
+TIMESTAMP = 1651959624
+SHA256 (avrdudes-avrdude-7.0-v7.0_GH0.tar.gz) = 302c6a5fbda1f4a046ef0c5d78b3612821bd9b43b7bf656dc96ec66e6793361e
+SIZE (avrdudes-avrdude-7.0-v7.0_GH0.tar.gz) = 2354106
diff --git a/devel/avrdude/pkg-plist b/devel/avrdude/pkg-plist
index b1acdd4875ba..1a6d312429f1 100644
--- a/devel/avrdude/pkg-plist
+++ b/devel/avrdude/pkg-plist
@@ -1,8 +1,5 @@
 bin/avrdude
 etc/avrdude.conf
 include/libavrdude.h
 lib/libavrdude.a
-lib/libavrdude.so
-lib/libavrdude.so.1
-lib/libavrdude.so.1.0.0
 man/man1/avrdude.1.gz