diff --git a/games/exult/Makefile b/games/exult/Makefile
index 578fe06b7c1c..af38a8c15298 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -1,74 +1,80 @@
 PORTNAME=	exult
-DISTVERSIONPREFIX=	v
-DISTVERSION=	1.9.0.20220721
+DISTVERSION?=	1.8
 CATEGORIES=	games
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Engine for Ultima VII (BG, FOV, SI, SS)
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libogg.so:audio/libogg \
 		libpng.so:graphics/png \
 		libvorbis.so:audio/libvorbis
 
 USES=		autoreconf compiler:c++17-lang gmake libtool localbase \
 		pkgconfig sdl xorg
 
-USE_GITHUB=	yes
-GH_TAGNAME=	snapshot-${DISTVERSIONPREFIX}${DISTVERSION}
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30
 USE_SDL=	mixer2 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/
+.else
+USE_GITHUB=	yes
+GH_TAGNAME=	snapshot-${DISTVERSIONPREFIX}${DISTVERSION}
+.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 \
 			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=libglade2
 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.mk>
diff --git a/games/exult/distinfo b/games/exult/distinfo
index 30df66f787e9..20ad1041b9a7 100644
--- a/games/exult/distinfo
+++ b/games/exult/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1658394368
-SHA256 (exult-exult-v1.9.0.20220721-snapshot-v1.9.0.20220721_GH0.tar.gz) = 677a08e61c8c08c9073b043e44c6b87a680f8caf6a176299a1ca77e48bdff0d7
-SIZE (exult-exult-v1.9.0.20220721-snapshot-v1.9.0.20220721_GH0.tar.gz) = 19260449
+TIMESTAMP = 1659184424
+SHA256 (exult-1.8.tar.gz) = dae6b7b08925d3db1dda3aca612bdc08d934ca04de817a008f305320e667faf9
+SIZE (exult-1.8.tar.gz) = 19104130
diff --git a/games/exult/pkg-plist b/games/exult/pkg-plist
index 9515ce3c2a3b..1c4cf5bfa941 100644
--- a/games/exult/pkg-plist
+++ b/games/exult/pkg-plist
@@ -1,72 +1,73 @@
 bin/cmanip
 bin/expack
 bin/exult
 %%STUDIO%%bin/exult_studio
 bin/ipack
 bin/mklink
 bin/rip
 bin/shp2pcx
 bin/splitshp
 bin/textpack
 bin/u7voice2syx
 bin/ucxt
 bin/wuc
+%%GIMP%%libexec/gimp/2.2/plug-ins/u7shp
 man/man1/expack.1.gz
 man/man1/exult_studio.1.gz
 man/man1/ipack.1.gz
 man/man1/shp2pcx.1.gz
 man/man1/splitshp.1.gz
 man/man1/textpack.1.gz
 man/man1/ucc.1.gz
 man/man6/exult.6.gz
-%%GIMP%%libexec/gimp/2.2/plug-ins/u7shp
 share/applications/exult.desktop
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/ReadMe.html
 %%PORTDOCS%%%%DOCSDIR%%/exult_studio.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/images/back.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/docs01.png
 %%PORTDOCS%%%%DOCSDIR%%/images/docs02.png
 %%PORTDOCS%%%%DOCSDIR%%/images/docs03.png
 %%PORTDOCS%%%%DOCSDIR%%/images/docs04.png
 %%PORTDOCS%%%%DOCSDIR%%/images/docs05.png
 %%PORTDOCS%%%%DOCSDIR%%/images/docs06.png
 %%PORTDOCS%%%%DOCSDIR%%/images/exult_logo.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/studio01.png
 %%PORTDOCS%%%%DOCSDIR%%/images/studio02.png
 %%PORTDOCS%%%%DOCSDIR%%/images/studio03.png
 %%PORTDOCS%%%%DOCSDIR%%/images/studio04.png
 %%PORTDOCS%%%%DOCSDIR%%/images/studio05.png
 %%PORTDOCS%%%%DOCSDIR%%/images/studio06.png
 %%PORTDOCS%%%%DOCSDIR%%/images/studio07.png
 %%PORTDOCS%%%%DOCSDIR%%/images/studio08.png
 %%PORTDOCS%%%%DOCSDIR%%/images/studio09.png
 %%PORTDOCS%%%%DOCSDIR%%/images/studio10.png
 %%PORTDOCS%%%%DOCSDIR%%/images/studiobgiregs.png
 %%PORTDOCS%%%%DOCSDIR%%/images/studiosiiregs.png
 %%STUDIO%%%%DATADIR%%/estudio/new/avatar_data.txt
 %%STUDIO%%%%DATADIR%%/estudio/new/blends.dat
 %%STUDIO%%%%DATADIR%%/estudio/new/combos.flx
 %%STUDIO%%%%DATADIR%%/estudio/new/faces.vga
 %%STUDIO%%%%DATADIR%%/estudio/new/fonts.vga
 %%STUDIO%%%%DATADIR%%/estudio/new/gumps.vga
 %%STUDIO%%%%DATADIR%%/estudio/new/palettes.flx
 %%STUDIO%%%%DATADIR%%/estudio/new/paperdol.vga
 %%STUDIO%%%%DATADIR%%/estudio/new/pointers.shp
 %%STUDIO%%%%DATADIR%%/estudio/new/shapes.vga
 %%STUDIO%%%%DATADIR%%/estudio/new/sprites.vga
 %%STUDIO%%%%DATADIR%%/estudio/new/text.flx
 %%DATADIR%%/exult.flx
 %%DATADIR%%/exult_bg.flx
 %%DATADIR%%/exult_si.flx
 %%STUDIO%%%%DATADIR%%/exult_studio.glade
+%%DATADIR%%/exultmsg.txt
 %%DATADIR%%/midisfx.flx
 %%DATADIR%%/u7bgintrinsics.data
 %%DATADIR%%/u7misc.data
 %%DATADIR%%/u7opcodes.data
 %%DATADIR%%/u7sibetaintrinsics.data
 %%DATADIR%%/u7siintrinsics.data
 share/pixmaps/exult.png