diff --git a/emulators/x16-emulator/Makefile b/emulators/x16-emulator/Makefile
index 433d3718c2db..ab1531bd1872 100644
--- a/emulators/x16-emulator/Makefile
+++ b/emulators/x16-emulator/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	x16-emulator
-DISTVERSION=	r40
+DISTVERSION=	r43
 CATEGORIES=	emulators
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Emulator for the Commander X16 8-bit computer
-WWW=		https://github.com/commanderx16
+WWW=		https://github.com/X16Community
 
 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
+GH_ACCOUNT=	X16Community
 
 DESKTOP_ENTRIES=	"Commander X16" \
 			"" \
 			"" \
 			"x16emu" \
 			"" \
 			true
 
 PLIST_FILES=	bin/x16emu
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/src/main.c
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 	${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS=-Wno-error=deprecated-non-prototype |g' \
 		${WRKSRC}/Makefile
 .endif
 
 
 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 c7e45ab2aadd..46a60b2fdb2a 100644
--- a/emulators/x16-emulator/distinfo
+++ b/emulators/x16-emulator/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650712312
-SHA256 (commanderx16-x16-emulator-r40_GH0.tar.gz) = 0dd468b4739c92a54799a42a4e93136892cf477dd0aab4adf2c5f0c03394b810
-SIZE (commanderx16-x16-emulator-r40_GH0.tar.gz) = 179120
+TIMESTAMP = 1689077308
+SHA256 (X16Community-x16-emulator-r43_GH0.tar.gz) = dde03f22d89bb2979b827219f4f66cd506d5195f75be0f0f1c82e91ae019378c
+SIZE (X16Community-x16-emulator-r43_GH0.tar.gz) = 222496
diff --git a/emulators/x16-emulator/files/patch-src_files.c b/emulators/x16-emulator/files/patch-src_files.c
new file mode 100644
index 000000000000..6360212dc55d
--- /dev/null
+++ b/emulators/x16-emulator/files/patch-src_files.c
@@ -0,0 +1,10 @@
+--- src/files.c.orig	2023-05-17 05:45:51 UTC
++++ src/files.c
+@@ -8,6 +8,7 @@
+ #include <limits.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <SDL.h>
+ #include <zlib.h>
+ #include <inttypes.h>
diff --git a/emulators/x16-emulator/files/patch-src_main.c b/emulators/x16-emulator/files/patch-src_main.c
index 5c5e7e7be4a4..5e7960839ec9 100644
--- a/emulators/x16-emulator/files/patch-src_main.c
+++ b/emulators/x16-emulator/files/patch-src_main.c
@@ -1,11 +1,11 @@
---- src/main.c.orig	2022-04-16 06:55:20 UTC
+--- src/main.c.orig	2023-05-17 05:45:51 UTC
 +++ src/main.c
-@@ -475,7 +475,7 @@ main(int argc, char **argv)
+@@ -575,7 +575,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.
diff --git a/emulators/x16-rom/Makefile b/emulators/x16-rom/Makefile
index fe523d34684e..eecea3da3ce5 100644
--- a/emulators/x16-rom/Makefile
+++ b/emulators/x16-rom/Makefile
@@ -1,28 +1,32 @@
 PORTNAME=	x16-rom
-DISTVERSION=	r40
+DISTVERSION=	r43
 CATEGORIES=	emulators
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Commander X16 ROM
-WWW=		https://github.com/commanderx16
+WWW=		https://github.com/X16Community
 
-BUILD_DEPENDS=	cc65:devel/cc65
+BUILD_DEPENDS=	cc65:devel/cc65 \
+		bash:shells/bash
 
-USES=		gmake python:build
+USES=		gmake python:build shebangfix
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	commanderx16
+GH_ACCOUNT=	X16Community
+
+SHEBANG_FILES=	findsymbols
+MAKE_JOBS_UNSAFE=	yes
 
 DATADIR=	${PREFIX}/share/x16-emulator
 BINARY_ALIAS=	make=${MAKE_CMD} \
 		python3=${PYTHON_CMD}
 PORTDATA=	rom.bin
 
 post-patch:
 	${REINPLACE_CMD} '1s,bash,sh,' ${WRKSRC}/scripts/symbolize.sh
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/build/x16/rom.bin ${STAGEDIR}/${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/emulators/x16-rom/distinfo b/emulators/x16-rom/distinfo
index ec951fe071ce..50f8d09167dc 100644
--- a/emulators/x16-rom/distinfo
+++ b/emulators/x16-rom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650710255
-SHA256 (commanderx16-x16-rom-r40_GH0.tar.gz) = ea4df051b355f12d6566a6d761a14a4d3633acc57349d33ce87b4806646f482e
-SIZE (commanderx16-x16-rom-r40_GH0.tar.gz) = 604486
+TIMESTAMP = 1689076803
+SHA256 (X16Community-x16-rom-r43_GH0.tar.gz) = 8a9182e580d34d8ec15ce61f8269916e1371da44a9445fd14c95bdaf5842d322
+SIZE (X16Community-x16-rom-r43_GH0.tar.gz) = 720134