diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index b6ae30c71136..90567aa5f64f 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	gnustep-make
-PORTVERSION=	2.8.0
-PORTREVISION=	1
+DISTVERSION=	2.9.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
+CONFIGURE_ARGS+=	--with-thread-lib=-pthread \
+			--with-config-file=${GNUSTEP_PREFIX}/GNUstep.conf \
+			--with-layout=gnustep \
+			--enable-objc-nonfragile-abi \
+			--enable-native-objc-exceptions \
+			--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/distinfo b/devel/gnustep-make/distinfo
index 143867919626..a84ee4ef1abc 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613239606
-SHA256 (gnustep-make-2.8.0.tar.gz) = 9fce2942dd945c103df37d668dd5fff650b23351b25a650428f6f59133f5ca5d
-SIZE (gnustep-make-2.8.0.tar.gz) = 606337
+TIMESTAMP = 1704118196
+SHA256 (gnustep-make-2.9.1.tar.gz) = c3d6e70cf156b27e7d1ed2501c57df3f96e27488ce2f351b93e479c58c01eae7
+SIZE (gnustep-make-2.9.1.tar.gz) = 621081
diff --git a/devel/gnustep-make/files/patch-texinfo b/devel/gnustep-make/files/patch-texinfo
deleted file mode 100644
index e2a89f0b5132..000000000000
--- a/devel/gnustep-make/files/patch-texinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-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 ]; \