diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile
index b06bd80984f6..7e6ea7d47325 100644
--- a/devel/avrdude/Makefile
+++ b/devel/avrdude/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	avrdude
 PORTVERSION=	7.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Program for programming the on-chip memory of Atmel AVR CPUs
 WWW=		https://www.nongnu.org/avrdude/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 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
 
 # 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/files/patch-src_jtagmkII.c b/devel/avrdude/files/patch-src_jtagmkII.c
new file mode 100644
index 000000000000..17ca7c9a968e
--- /dev/null
+++ b/devel/avrdude/files/patch-src_jtagmkII.c
@@ -0,0 +1,13 @@
+--- src/jtagmkII.c.orig	2022-05-07 20:39:47 UTC
++++ src/jtagmkII.c
+@@ -1840,8 +1840,8 @@ void jtagmkII_close(PROGRAMMER * pgm)
+ 
+   avrdude_message(MSG_NOTICE2, "%s: jtagmkII_close()\n", progname);
+ 
+-  if (pgm->flag & PGM_FL_IS_PDI) {
+-    /* When in PDI mode, restart target. */
++  if (pgm->flag & (PGM_FL_IS_PDI|PGM_FL_IS_JTAG)) {
++    /* When in PDI or JTAG mode, restart target. */
+     buf[0] = CMND_GO;
+     avrdude_message(MSG_NOTICE2, "%s: jtagmkII_close(): Sending GO command: ",
+ 	      progname);