diff --git a/games/exult-devel/Makefile b/games/exult-devel/Makefile
index 1a908375dc9d..92ff65fd1b4b 100644
--- a/games/exult-devel/Makefile
+++ b/games/exult-devel/Makefile
@@ -1,15 +1,16 @@
 DISTVERSIONPREFIX=	snapshot-v
-DISTVERSION=	1.9.0.20240325
+DISTVERSION=	1.9.0.20240531
 PORTREVISION=	0 # Always set PORTREVISION explicitly as otherwise it is inherited from games/exult
 PKGNAMESUFFIX=	-devel
 
 CONFLICTS_INSTALL=	exult
 BUILD_DEPENDS=		autoconf-archive>=0:devel/autoconf-archive
 STUDIO_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libharfbuzz.so:print/harfbuzz \
 			libicuuc.so:devel/icu
 
 MASTERDIR=	${.CURDIR}/../exult
+PATCHDIR=	${.CURDIR}/files
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 .include "${MASTERDIR}/Makefile"
diff --git a/games/exult-devel/distinfo b/games/exult-devel/distinfo
index fb8b8d9c95d8..aca1ed06e02f 100644
--- a/games/exult-devel/distinfo
+++ b/games/exult-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711374672
-SHA256 (exult-exult-snapshot-v1.9.0.20240325_GH0.tar.gz) = 19e4d7658c23a3a89d53f625c12afb7a2f47aac94484fbe8a0325eec0b4938d8
-SIZE (exult-exult-snapshot-v1.9.0.20240325_GH0.tar.gz) = 19374526
+TIMESTAMP = 1717230197
+SHA256 (exult-exult-snapshot-v1.9.0.20240531_GH0.tar.gz) = 01a263fe14a222576bcc9af7c2b9bb4c1c679af5443bff1af9f898350b4e95d3
+SIZE (exult-exult-snapshot-v1.9.0.20240531_GH0.tar.gz) = 19385217
diff --git a/games/exult-devel/files/patch-mapedit_Makefile.am b/games/exult-devel/files/patch-mapedit_Makefile.am
new file mode 100644
index 000000000000..a05690e7520e
--- /dev/null
+++ b/games/exult-devel/files/patch-mapedit_Makefile.am
@@ -0,0 +1,13 @@
+--- mapedit/Makefile.am.orig	2024-05-30 10:27:11 UTC
++++ mapedit/Makefile.am
+@@ -103,8 +103,8 @@ install-exec-local:
+ 
+ if GIMP_PLUGIN
+ install-exec-local:
+-	install -d $(DESTDIR)$(GIMP_PLUGIN_PREFIX)
+-	install -c $(GIMP_PLUGINS) $(DESTDIR)$(GIMP_PLUGIN_PREFIX)
++	$(MKDIR_P) $(DESTDIR)$(GIMP_PLUGIN_PREFIX)
++	$(INSTALL_PROGRAM) $(GIMP_PLUGINS) $(DESTDIR)$(GIMP_PLUGIN_PREFIX)
+ else
+ install-exec-local:
+ endif
diff --git a/games/exult-devel/files/patch-tools_Makefile.am b/games/exult-devel/files/patch-tools_Makefile.am
new file mode 100644
index 000000000000..5c4f64ac46d2
--- /dev/null
+++ b/games/exult-devel/files/patch-tools_Makefile.am
@@ -0,0 +1,29 @@
+--- tools/Makefile.am.orig	2024-05-30 10:27:11 UTC
++++ tools/Makefile.am
+@@ -68,11 +68,11 @@ if BUILD_GTHUMB
+ ## Does not work:
+ #thumbnailerdir=$(datadir)/thumbnailers
+ ## Needs to be in /usr/share/thumbnailers
+-thumbnailerdir=/usr/share/thumbnailers
++thumbnailerdir=$(datadir)/thumbnailers
+ thumbnailer_in_files=$(top_srcdir)/tools/gnome_u7shapes.thumbnailer.in
+ thumbnailer_DATA=$(thumbnailer_in_files:.thumbnailer.in=.thumbnailer)
+ gnome_shp_thumbnailer_DATA=x-shapefile.xml
+-gnome_shp_thumbnailerdir=$(DESTDIR)$(datadir)/mime/packages
++gnome_shp_thumbnailerdir=$(datadir)/mime/packages
+ 
+ # Rule to make the service file with bindir expanded
+ $(thumbnailer_DATA): $(thumbnailer_in_files)
+@@ -117,10 +117,10 @@ install-data-hook:
+ 
+ if BUILD_GTHUMB
+ install-data-hook:
+-	update-mime-database $(DESTDIR)$(datadir)/mime || :
++	:
+ 
+ uninstall-hook:
+-	update-mime-database $(DESTDIR)$(datadir)/mime || :
++	:
+ else
+ install-data-hook:
+ uninstall-hook:
diff --git a/games/exult-devel/files/pkg-message.in b/games/exult-devel/files/pkg-message.in
new file mode 100644
index 000000000000..6a5d128a9a77
--- /dev/null
+++ b/games/exult-devel/files/pkg-message.in
@@ -0,0 +1,7 @@
+[
+{ type: install
+  message: <<EOM
+ Please, read %%DOCSDIR%%/README for additional information.
+EOM
+}
+]
diff --git a/games/exult/Makefile b/games/exult/Makefile
index 57ad1c1e8c0e..131a9868b4a4 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -1,90 +1,88 @@
 PORTNAME=	exult
 DISTVERSION?=	1.8
 PORTREVISION?=	6
 PORTEPOCH=	1
 CATEGORIES=	games
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Engine for Ultima VII (BG, FOV, SI, SS)
 WWW=		http://exult.info
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libogg.so:audio/libogg \
 		libpng16.so:graphics/png \
 		libvorbis.so:audio/libvorbis
 
 USES=		autoreconf compiler:c++17-lang gmake libtool localbase \
 		pkgconfig sdl xorg
 USE_GNOME=	cairo gdkpixbuf2
 USE_SDL=	sdl2
 USE_XORG=	x11 xext
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static \
 		--enable-shared \
 		--with-icondir=${PREFIX}/share/pixmaps
 
 CONFLICTS_INSTALL=	exult-devel
 SUB_FILES=		pkg-message
 PLIST?=			${.CURDIR}/pkg-plist
 
 .if !defined(MASTERDIR)
 MASTER_SITES=	http://prdownloads.sourceforge.net/exult/
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-version.cc \
-		${PATCHDIR}/extra-patch-configure.ac
 .else
 USE_GITHUB=	yes
 .endif
 
 OPTIONS_DEFINE=		ALSA DEBUG DOCS FLUIDSYNTH GIMP STUDIO
 OPTIONS_DEFAULT=	STUDIO
 OPTIONS_SUB=		yes
 
 GIMP_DESC=	GIMP plugin support
 STUDIO_DESC=	Install Exult Studio
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 
 DEBUG_CONFIGURE_ON=	--with-debug=full \
 			--with-optimization=none
 DEBUG_CONFIGURE_OFF=	--with-debug=no
 
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CONFIGURE_ENABLE=	fluidsynth
 
 GIMP_LIB_DEPENDS=	libbabl-0.1.so:x11/babl \
 			libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			libgegl-0.4.so:graphics/gegl \
 			libgegl-npd-0.4.so:graphics/gegl \
 			libgimp-2.0.so:graphics/gimp-app \
 			libharfbuzz.so:print/harfbuzz \
 			libjson-glib-1.0.so:devel/json-glib
 GIMP_USES=		gnome
 GIMP_USE=		GNOME=gtk20,pango
 
 GIMP_CONFIGURE_ENABLE=	gimp-plugin
 
 STUDIO_LIB_DEPENDS?=		libharfbuzz.so:print/harfbuzz
 STUDIO_USES=			gnome
 STUDIO_USE=			GNOME=gtk30
 STUDIO_CONFIGURE_ENABLE=	exult-studio exult-studio-support
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in FAQ NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.options.mk>
 
 # Silence cast warnings from GTK callbacks in clang >=16
 # https://github.com/exult/exult/issues/416
 .if !defined(PKGNAMESUFFIX) && ( ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )))
 CFLAGS+=	-Wno-cast-function-type-strict
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/exult/files/extra-patch-configure.ac b/games/exult/files/patch-configure.ac
similarity index 100%
rename from games/exult/files/extra-patch-configure.ac
rename to games/exult/files/patch-configure.ac
diff --git a/games/exult/files/extra-patch-version.cc b/games/exult/files/patch-version.cc
similarity index 100%
rename from games/exult/files/extra-patch-version.cc
rename to games/exult/files/patch-version.cc