diff --git a/sysutils/nmrpflash/Makefile b/sysutils/nmrpflash/Makefile
index d9e7e30b1494..8760abd16500 100644
--- a/sysutils/nmrpflash/Makefile
+++ b/sysutils/nmrpflash/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	nmrpflash
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.20
+DISTVERSION=	0.9.21
 CATEGORIES=	sysutils
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Unofficial flash tool for Netgear network devices
 WWW=		https://github.com/jclehner/nmrpflash
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jclehner
 
 MAKE_FLAGS=	VERSION=${DISTVERSION}
 
 ALL_TARGET=	${PORTNAME}
 
 PLIST_FILES=	sbin/${PORTNAME}
 PORTDOCS=	README.md README-R7000.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/README-R7000.md ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/sysutils/nmrpflash/distinfo b/sysutils/nmrpflash/distinfo
index 2c5e1aee4666..0710f2982480 100644
--- a/sysutils/nmrpflash/distinfo
+++ b/sysutils/nmrpflash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1682318825
-SHA256 (jclehner-nmrpflash-v0.9.20_GH0.tar.gz) = 4aa17a84735f04e91b5e90e9a61e8c48033a5689bf45594ea1eeff715f0acd48
-SIZE (jclehner-nmrpflash-v0.9.20_GH0.tar.gz) = 53066
+TIMESTAMP = 1694852399
+SHA256 (jclehner-nmrpflash-v0.9.21_GH0.tar.gz) = 0be3a8771087b592002258ce6f34729da7a76d81eff52ac95dee788c0f4fc9b3
+SIZE (jclehner-nmrpflash-v0.9.21_GH0.tar.gz) = 60519
diff --git a/sysutils/nmrpflash/files/patch-Makefile b/sysutils/nmrpflash/files/patch-Makefile
new file mode 100644
index 000000000000..666c92d01a0f
--- /dev/null
+++ b/sysutils/nmrpflash/files/patch-Makefile
@@ -0,0 +1,8 @@
+--- Makefile.orig	2023-09-15 09:39:49 UTC
++++ Makefile
+@@ -1,4 +1,4 @@
+-CC = $(CROSS)gcc
++CC ?= $(CROSS)gcc
+ STRIP = $(CROSS)strip
+ PKG_CONFIG ?= pkg-config
+ PREFIX ?= /usr/local