diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 8dd4af055654..b6ae30c71136 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,61 +1,62 @@
 PORTNAME=	gnustep-make
 PORTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	GNUSTEP/core
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNUstep makefile package
 WWW=		http://www.gnustep.org/
 
 LICENSE=	GPLv3
 
 USES=		gnustep objc shebangfix
 GNU_CONFIGURE=	yes
 SHEBANG_FILES=	bake_debian_files.sh
 
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 CONFIGURE_ENV+=	INSTALL_PROGRAM="${INSTALL} -c" INSTALL_DATA="${INSTALL} -c"
 CONFIGURE_ARGS+=	--with-thread-lib=-pthread
 CONFIGURE_ARGS+=	--with-config-file=${GNUSTEP_PREFIX}/GNUstep.conf
 CONFIGURE_ARGS+=	--with-layout=gnustep
 CONFIGURE_ARGS+=	--enable-objc-nonfragile-abi --enable-native-objc-exceptions
 CONFIGURE_ARGS+=	--with-library-combo=ng-gnu-gnu
 GNU_CONFIGURE_PREFIX=	${GNUSTEP_PREFIX}
 NO_ARCH=	yes
 
 post-install:
 	${LN} -s Library/Makefiles ${STAGEDIR}${GNUSTEP_PREFIX}/System/
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Applications
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/ApplicationSupport
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Bundles
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/ColorPickers
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Colors
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/DocTemplates
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Documentation/info
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Documentation/man
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Documentation/Developer
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Documentation/User
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Fonts
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Frameworks
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Headers
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Images
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/KeyBindings
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Libraries/Java
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Libraries/Resources
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/PostScript
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Services
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Library/Sounds
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Tools/Java
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Tools/Resources
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/Local/Applications
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/Local/Library/ApplicationSupport
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/Local/Library/Bundles
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/Local/Library/Documentation
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/Local/Library/Frameworks
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/Local/Library/Headers
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/Local/Library/Libraries
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/Local/Library/Preferences
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/Local/Library/Services
 	-${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/Local/Tools/Resources
 
 .include <bsd.port.mk>
diff --git a/devel/gnustep-make/files/patch-texinfo b/devel/gnustep-make/files/patch-texinfo
new file mode 100644
index 000000000000..e2a89f0b5132
--- /dev/null
+++ b/devel/gnustep-make/files/patch-texinfo
@@ -0,0 +1,13 @@
+Obtained from:	https://github.com/gnustep/tools-make/commit/3ff4ee8a053b85d63cd34f645258902bb0dc6f04
+
+--- Instance/Documentation/texi.make.orig	2020-04-05 14:59:54 UTC
++++ Instance/Documentation/texi.make
+@@ -92,7 +92,7 @@ $(GNUSTEP_INSTANCE).pdf: $(TEXI_FILES)
+ # so after running it we try to move any from the subdirectory to
+ # where they are expected.
+ $(GNUSTEP_INSTANCE)/index.html: $(TEXI_FILES)
+-	-$(GNUSTEP_TEXI2HTML) \
++	-$(GNUSTEP_TEXI2HTML) --output=$(OUTFILE) \
+                 $(GNUSTEP_TEXI2HTML_FLAGS) $(ADDITIONAL_TEXI2HTML_FLAGS) \
+ 		$(GNUSTEP_INSTANCE).texi; \
+                 if [ -f $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE)_toc.html ]; \