diff --git a/net/portfwd/Makefile b/net/portfwd/Makefile
index 0d557847f6d0..5c23feb03a42 100644
--- a/net/portfwd/Makefile
+++ b/net/portfwd/Makefile
@@ -1,34 +1,36 @@
 PORTNAME=	portfwd
 PORTVERSION=	0.29
 PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Port Forwarding Daemon
 WWW=		http://portfwd.sourceforge.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake
 USE_RC_SUBR=	${PORTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|-Wall -ggdb -O3|${CFLAGS}|g" \
 		${WRKSRC}/src/Makefile.am
 	@${REINPLACE_CMD} -e "s|-Wall -g -O3|${CFLAGS}|g" \
 		${WRKSRC}/tools/Makefile.am
+	@${REINPLACE_CMD} -e "s|register ||g" \
+		${WRKSRC}/src/lexconf.c ${WRKSRC}/src/yconf.c
 	@${TOUCH} ${WRKSRC}/* ${WRKSRC}/*/*
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/rc.d
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/cfg/*.cfg ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/net/portfwd/files/patch-getopt_getopt.c b/net/portfwd/files/patch-getopt_getopt.c
new file mode 100644
index 000000000000..2a2f5ea43e7d
--- /dev/null
+++ b/net/portfwd/files/patch-getopt_getopt.c
@@ -0,0 +1,10 @@
+--- getopt/getopt.c.orig	2023-06-28 09:07:29 UTC
++++ getopt/getopt.c
+@@ -40,6 +40,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ /* Comment out all this code if we are using the GNU C Library, and are not
+    actually compiling the library itself.  This code is part of the GNU C