diff --git a/games/iortcw/Makefile b/games/iortcw/Makefile
index 5a623072aac1..3aeb52255db1 100644
--- a/games/iortcw/Makefile
+++ b/games/iortcw/Makefile
@@ -1,83 +1,83 @@
 PORTNAME=	iortcw
 PORTVERSION=	1.51c
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	games
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Game engine for Return to Castle Wolfenstein
 
 LICENSE=	GPLv3
 
-NOT_FOR_ARCHS=		aarch64 armv6 armv7 riscv64
+NOT_FOR_ARCHS=		aarch64 armv6 armv7
 NOT_FOR_ARCHS_REASON=	fails to configure: Architecture not supported
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfreetype.so:print/freetype2 \
 		libogg.so:audio/libogg \
 		libopus.so:audio/opus \
 		libopusfile.so:audio/opusfile
 
 USES=		compiler:c++11-lang gl gmake jpeg openal pkgconfig sdl xorg
 USE_GITHUB=	yes
 USE_GL=		gl
 USE_SDL=	sdl2
 
 WOLFDIR=	"libexec/${PORTNAME}"
 MAKE_ARGS=	BINDIR="${STAGEDIR}${PREFIX}/bin" \
 		COPYDIR="${STAGEDIR}${PREFIX}/${WOLFDIR}"
 
 LDFLAGS_i386=	-Wl,-znotext
 
 PLIST_SUB=	ARCH="${ARCH}" \
 		WOLFDIR="${WOLFDIR}"
 
 SUB_FILES=	iowolfded iowolfmp iowolfsp pkg-message
 SUB_LIST=	ARCH="${ARCH}" \
 		DISTVERSION="${DISTVERSION}" \
 		WOLFDIR="${PREFIX}/${WOLFDIR}"
 
 OPTIONS_DEFINE=		MP SP
 OPTIONS_DEFAULT=	MP SP
 OPTIONS_SUB=		yes
 
 MP_DESC=	Build multiplayer support
 SP_DESC=	Build singleplayer support
 
 SP_ALL_TARGET=		sp
 SP_DESKTOP_ENTRIES=	"Return to Castle Wolfenstein" \
 			"Return to Castle Wolfenstein" \
 			"${DATADIR}/wolf512.png" \
 			"iowolfsp" \
 			"Game;" \
 			false
 SP_INSTALL_TARGET=	sp-install
 
 MP_ALL_TARGET=		mp
 MP_DESKTOP_ENTRIES=	"Return to Castle Wolfenstein (MP)" \
 			"Return to Castle Wolfenstein Multiplayer" \
 			"${DATADIR}/wolf512.png" \
 			"iowolfmp" \
 			"Game;" \
 			false
 MP_INSTALL_TARGET=	mp-install
 
 post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} '/\.git\/index/d' ${WRKSRC}/SP/Makefile
 	@${REINPLACE_CMD} '/\.git\/index/d' ${WRKSRC}/MP/Makefile
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/MP/misc/wolf512.png ${STAGEDIR}${DATADIR}
 
 post-install-MP-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/iowolfmp ${STAGEDIR}${PREFIX}/bin/iowolfmp
 	${INSTALL_SCRIPT} ${WRKDIR}/iowolfded ${STAGEDIR}${PREFIX}/bin/iowolfded
 
 post-install-SP-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/iowolfsp ${STAGEDIR}${PREFIX}/bin/iowolfsp
 
 .include <bsd.port.mk>
diff --git a/games/iortcw/files/patch-MP_code_qcommon_q__platform.h b/games/iortcw/files/patch-MP_code_qcommon_q__platform.h
index 20bd2d05a3e6..770e384a9750 100644
--- a/games/iortcw/files/patch-MP_code_qcommon_q__platform.h
+++ b/games/iortcw/files/patch-MP_code_qcommon_q__platform.h
@@ -1,30 +1,32 @@
 --- MP/code/qcommon/q_platform.h.orig	2019-03-16 18:09:48 UTC
 +++ MP/code/qcommon/q_platform.h
 @@ -35,11 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  
  #else
  
 -#if (defined _M_IX86 || defined __i386__) && !defined(C_ONLY)
 -#define id386 1
 -#else
  #define id386 0
 -#endif
  
  #if (defined(powerc) || defined(powerpc) || defined(ppc) || \
  	defined(__ppc) || defined(__ppc__)) && !defined(C_ONLY)
-@@ -224,11 +220,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+@@ -224,11 +220,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  #ifdef __i386__
  #define ARCH_STRING "i386"
  #elif defined __amd64__
 -#undef idx64
 -#define idx64 1
  #define ARCH_STRING "amd64"
  #elif defined __axp__
  #define ARCH_STRING "alpha"
 +#elif defined __powerpc64__
 +#define ARCH_STRING "powerpc64"
 +#elif defined __powerpc__
 +#define ARCH_STRING "powerpc"
++#elif defined __riscv
++#define ARCH_STRING "riscv64"
  #endif
  
  #if BYTE_ORDER == BIG_ENDIAN
diff --git a/games/iortcw/files/patch-SP_code_qcommon_q__platform.h b/games/iortcw/files/patch-SP_code_qcommon_q__platform.h
index deecff300c60..84d7ad28d17e 100644
--- a/games/iortcw/files/patch-SP_code_qcommon_q__platform.h
+++ b/games/iortcw/files/patch-SP_code_qcommon_q__platform.h
@@ -1,30 +1,32 @@
 --- SP/code/qcommon/q_platform.h.orig	2019-03-16 18:09:48 UTC
 +++ SP/code/qcommon/q_platform.h
 @@ -35,11 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  
  #else
  
 -#if (defined _M_IX86 || defined __i386__) && !defined(C_ONLY)
 -#define id386 1
 -#else
  #define id386 0
 -#endif
  
  #if (defined(powerc) || defined(powerpc) || defined(ppc) || \
  	defined(__ppc) || defined(__ppc__)) && !defined(C_ONLY)
-@@ -224,11 +220,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+@@ -224,11 +220,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  #ifdef __i386__
  #define ARCH_STRING "i386"
  #elif defined __amd64__
 -#undef idx64
 -#define idx64 1
  #define ARCH_STRING "amd64"
  #elif defined __axp__
  #define ARCH_STRING "alpha"
 +#elif defined __powerpc64__
 +#define ARCH_STRING "powerpc64"
 +#elif defined __powerpc__
 +#define ARCH_STRING "powerpc"
++#elif defined __riscv
++#define ARCH_STRING "riscv64"
  #endif
  
  #if BYTE_ORDER == BIG_ENDIAN