diff --git a/emulators/dps8m/Makefile b/emulators/dps8m/Makefile
index 4a2689879a58..748efbfd4bd4 100644
--- a/emulators/dps8m/Makefile
+++ b/emulators/dps8m/Makefile
@@ -1,34 +1,41 @@
 PORTNAME=	dps8m
 DISTVERSIONPREFIX=	R
 DISTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	gspurki@gmail.com
 COMMENT=	SIMH based simulator for the Honeywell h6180/dps8m Multics processor
 WWW=		https://dps8m.gitlab.io/dps8m
 
 LICENSE=	ICU
 LICENSE_NAME=	ICU license
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le riscv64
 ONLY_FOR_ARCHS_REASON=	__uint128_t is only implemented on 64-bit platforms
 
 LIB_DEPENDS=	libuv.so:devel/libuv
 
 USES=		gmake
 USE_GITLAB=	yes
 
+CFLAGS_powerpc64=	-Datomic_testandset_64=atomic_testandset_long
+CFLAGS_powerpc64le=	-Datomic_testandset_64=atomic_testandset_long
+CFLAGS_riscv64=		-Datomic_testandset_64=atomic_testandset_long
+
 MAKEFILE=	GNUmakefile
 
 PLIST_FILES=	bin/dps8 \
 		bin/prt2pdf \
 		bin/punutil
 
+MAKE_ARGS=	V=1 NO_LTO=1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dps8/dps8 ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/prt2pdf/prt2pdf ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/punutil/punutil ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/emulators/dps8m/files/patch-src_Makefile.mk b/emulators/dps8m/files/patch-src_Makefile.mk
new file mode 100644
index 000000000000..be9c3e886588
--- /dev/null
+++ b/emulators/dps8m/files/patch-src_Makefile.mk
@@ -0,0 +1,11 @@
+--- src/Makefile.mk.orig	2023-08-13 10:22:22 UTC
++++ src/Makefile.mk
+@@ -294,7 +294,7 @@ endif
+ 
+ _DEBUGOPTFLAG := -g
+ ifndef TESTING
+-  OPTFLAGS = -O3 $(_DEBUGOPTFLAG) -U_FORTIFY_SOURCE -fno-stack-protector
++# OPTFLAGS = -O3 $(_DEBUGOPTFLAG) -U_FORTIFY_SOURCE -fno-stack-protector
+   ifdef DUMA
+     CFLAGS   += -I../dps8 -I. -include dps8_duma.h
+     OPTFLAGS += -DDUMA=1