diff --git a/devel/remake/Makefile b/devel/remake/Makefile
index f1a092c20211..d1a2fe5d62b6 100644
--- a/devel/remake/Makefile
+++ b/devel/remake/Makefile
@@ -1,34 +1,35 @@
 # Created by: arved
 
 PORTNAME=	remake
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/bashdb/remake/4.3+dbg-${PORTVERSION}/
 DISTNAME=	remake-4.3+dbg-${PORTVERSION}
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Fork of gmake with debugger
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 USES=		readline
 INFO=		remake
 CONFIGURE_ARGS=	--without-guile
 CFLAGS+=	-fcommon
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext iconv
 NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG} \
 			--with-libintl-prefix=${LOCALBASE}
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	${REINPLACE_CMD} -e "s,remake.info make.info,remake.info,; \
 		s,make.info remake.info,remake.info," \
 		${WRKSRC}/doc/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/devel/remake/files/patch-src_make.h b/devel/remake/files/patch-src_make.h
new file mode 100644
index 000000000000..003a3c732852
--- /dev/null
+++ b/devel/remake/files/patch-src_make.h
@@ -0,0 +1,14 @@
+--- src/make.h.orig	2022-07-30 04:29:00 UTC
++++ src/make.h
+@@ -100,11 +100,6 @@ extern int errno;
+ # endif
+ #endif
+ 
+-/* Some systems define _POSIX_VERSION but are not really POSIX.1.  */
+-#if (defined (butterfly) || defined (__arm) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386)))
+-# undef POSIX
+-#endif
+-
+ #if !defined (POSIX) && defined (_AIX) && defined (_POSIX_SOURCE)
+ # define POSIX 1
+ #endif
diff --git a/devel/remake/files/patch-src_makeint.h b/devel/remake/files/patch-src_makeint.h
new file mode 100644
index 000000000000..800952d09bb1
--- /dev/null
+++ b/devel/remake/files/patch-src_makeint.h
@@ -0,0 +1,14 @@
+--- src/makeint.h.orig	2022-07-30 04:31:09 UTC
++++ src/makeint.h
+@@ -113,11 +113,6 @@ extern int errno;
+ # endif
+ #endif
+ 
+-/* Some systems define _POSIX_VERSION but are not really POSIX.1.  */
+-#if (defined (butterfly) || defined (__arm) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386)))
+-# undef POSIX
+-#endif
+-
+ #if !defined (POSIX) && defined (_AIX) && defined (_POSIX_SOURCE)
+ # define POSIX 1
+ #endif