diff --git a/emulators/x16-emulator/Makefile b/emulators/x16-emulator/Makefile
index 0be74c226cdf..d33503f1c987 100644
--- a/emulators/x16-emulator/Makefile
+++ b/emulators/x16-emulator/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	x16-emulator
-DISTVERSION=	r38
+DISTVERSION=	r40
 CATEGORIES=	emulators
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Emulator for the Commander X16 8-bit computer
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${DATADIR}/rom.bin:emulators/x16-rom
 
 USES=		compiler:c++11-lang gmake sdl
 
 USE_SDL=	sdl2
 USE_GITHUB=	yes
 GH_ACCOUNT=	commanderx16
 
 DESKTOP_ENTRIES=	"Commander X16" \
 			"" \
 			"" \
 			"x16emu" \
 			"" \
 			true
 
 PLIST_FILES=	bin/x16emu
 
 post-patch:
-	${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/main.c
+	${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/src/main.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/x16emu ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/emulators/x16-emulator/distinfo b/emulators/x16-emulator/distinfo
index ac76e9bfb20f..c7e45ab2aadd 100644
--- a/emulators/x16-emulator/distinfo
+++ b/emulators/x16-emulator/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598527780
-SHA256 (commanderx16-x16-emulator-r38_GH0.tar.gz) = f0c6f911a287a567e0bd0046a167fcbaed007ed50568e925fd09b82060ad481f
-SIZE (commanderx16-x16-emulator-r38_GH0.tar.gz) = 168876
+TIMESTAMP = 1650712312
+SHA256 (commanderx16-x16-emulator-r40_GH0.tar.gz) = 0dd468b4739c92a54799a42a4e93136892cf477dd0aab4adf2c5f0c03394b810
+SIZE (commanderx16-x16-emulator-r40_GH0.tar.gz) = 179120
diff --git a/emulators/x16-emulator/files/patch-Makefile b/emulators/x16-emulator/files/patch-Makefile
deleted file mode 100644
index c55b0b18ee02..000000000000
--- a/emulators/x16-emulator/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	2020-01-03 23:42:34 UTC
-+++ Makefile
-@@ -10,8 +10,8 @@ else
- 	SDL2CONFIG=sdl2-config
- endif
- 
--CFLAGS=-std=c99 -O3 -Wall -Werror -g $(shell $(SDL2CONFIG) --cflags) -Iextern/include -Iextern/src
--LDFLAGS=$(shell $(SDL2CONFIG) --libs) -lm
-+CFLAGS += $(shell $(SDL2CONFIG) --cflags) -Iextern/include -Iextern/src
-+LDFLAGS += $(shell $(SDL2CONFIG) --libs) -lm
- 
- OUTPUT=x16emu
- 
diff --git a/emulators/x16-emulator/files/patch-main.c b/emulators/x16-emulator/files/patch-src_main.c
similarity index 70%
rename from emulators/x16-emulator/files/patch-main.c
rename to emulators/x16-emulator/files/patch-src_main.c
index 4ef3454b615c..5c5e7e7be4a4 100644
--- a/emulators/x16-emulator/files/patch-main.c
+++ b/emulators/x16-emulator/files/patch-src_main.c
@@ -1,11 +1,11 @@
---- main.c.orig	2020-01-22 19:56:11 UTC
-+++ main.c
-@@ -442,7 +442,7 @@ main(int argc, char **argv)
+--- src/main.c.orig	2022-04-16 06:55:20 UTC
++++ src/main.c
+@@ -475,7 +475,7 @@ main(int argc, char **argv)
  
  	run_after_load = false;
  
 -	char *base_path = SDL_GetBasePath();
 +	char *base_path = "%%PREFIX%%/share/x16-emulator/";
  
  	// This causes the emulator to load ROM data from the executable's directory when
  	// no ROM file is specified on the command line.