diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile
index b8f26cb84adb..fa036f5eb2dd 100644
--- a/emulators/aranym/Makefile
+++ b/emulators/aranym/Makefile
@@ -1,32 +1,37 @@
 PORTNAME=	aranym
 DISTVERSION=	1.1.0
 PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}/
 DISTNAME=	${PORTNAME}_${DISTVERSION}.orig
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Atari Running on Any Machine
 WWW=		https://aranym.github.io
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	openjpeg>0:graphics/openjpeg \
 		sdl-config:devel/sdl12
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		gmake jpeg perl5 pkgconfig gl localbase:ldflags sdl shebangfix xorg
 USE_GL=		gl
 USE_SDL=	sdl2 image2
 USE_XORG=	x11
-USE_CXXSTD=	c++14 # work around error: ISO C++17 does not allow 'register' storage class specifier, see https://github.com/aranym/aranym/issues/106
 
 SHEBANG_FILES=	tools/arabridge
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	-disable-nat-debug --disable-nat-debug --enable-nfjpeg
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+CPPFLAGS+=  -Dregister=
+.endif
+
 .include <bsd.port.mk>