diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile
index dd97ba72bf37..fa4715f69d1b 100644
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@@ -1,112 +1,113 @@
 PORTNAME=	qmc2
 PORTVERSION=	0.243
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators games
 
 MAINTAINER=	agh@riseup.net
 COMMENT=	Qt based UNIX MAME frontend
 WWW=		https://github.com/qmc2/qmc2-mame-fe
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	bash>0:shells/bash \
 		gawk>0:lang/gawk
 RUN_DEPENDS=	libglvnd>0:graphics/libglvnd \
 		mame>=0.250:emulators/mame
 
 USES=		compiler:c++11-lang desktop-file-utils gmake gl qt:5 sdl \
 		shebangfix tar:bzip2 xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	qmc2
 GH_PROJECT=	qmc2-mame-fe
 USE_GL=		gl glu
 USE_QT=		buildtools core declarative gui multimedia network opengl qmake \
 		script scripttools sql svg testlib webkit widgets xml \
 		xmlpatterns
 USE_SDL=	sdl2
 USE_XORG=	x11 xmu
 
 SHEBANG_FILES=	scripts/cleanup-category-ini.sh \
 		scripts/generate-option-lists.sh \
 		scripts/make-man-pages.sh \
 		scripts/plugin_helper.sh \
 		scripts/romalyzer.pl \
 		scripts/sdl-defines.sh \
 		scripts/sdl-includepath.sh \
 		scripts/sdl-libs.sh \
 		scripts/sdl-version.sh \
 		scripts/strip-png-headers.sh
 
 MAKE_ARGS=	ARCH="${OPSYS}" \
 		CC="${CC}" \
 		CC_FLAGS="${CFLAGS} -DUSE_FILE32API" \
 		CXX="${CXX}" \
 		CXX_FLAGS="${CXXFLAGS} -DUSE_FILE32API" \
 		DATADIR="${DATADIR}" \
 		LINK="${CXX}" \
 		MAKE="${MAKE_CMD}" \
 		PHONON="0" \
 		QMAKE="${QMAKE}" \
 		QTDIR="${PREFIX}" \
 		SYSCONFDIR="${PREFIX}/etc"
 
 ALL_TARGET=	all arcade tools
+CFLAGS_aarch64=	-march=armv8-a+crc+crypto
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 DOCS_DESC=	Comprehensive qmc2 documentaion
 
 DOCS_ALL_TARGET=	doc
 DOCS_PORTDOCS=		html
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000
 EXTRA_PATCHES=	${PATCHDIR}/extra-scripts-sdl-includepaths
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|DATADIR/qmc2|${DATADIR}|g' \
 		${WRKSRC}/inst/*.template
 
 do-install:
 	(cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} qmc2-sdlmame \
 		${STAGEDIR}${PREFIX}/bin/qmc2-mame)
 	(cd ${WRKSRC}/src/arcade && \
 		${INSTALL_PROGRAM} qmc2-arcade \
 		${STAGEDIR}${PREFIX}/bin)
 	(cd ${WRKSRC}/src/tools/qchdman && \
 		${INSTALL_PROGRAM} qchdman \
 		${STAGEDIR}${PREFIX}/bin)
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for data in img lng opt
 	(cd ${WRKSRC}/data && \
 		${COPYTREE_SHARE} ${data} ${STAGEDIR}${DATADIR})
 .endfor
 
 	${INSTALL_MAN} ${WRKSRC}/data/doc/man/qchdman.6.gz \
 		${STAGEDIR}${MANPREFIX}/man/man6
 	${INSTALL_MAN} ${WRKSRC}/data/doc/man/qmc2-arcade.6.gz \
 		${STAGEDIR}${MANPREFIX}/man/man6
 	${INSTALL_MAN} ${WRKSRC}/data/doc/man/qmc2-main-gui.6.gz \
 		${STAGEDIR}${MANPREFIX}/man/man6/qmc2-mame.6.gz
 
 .for dsktop_entry in qchdman.desktop qmc2-arcade.desktop qmc2.desktop
 	(cd ${WRKSRC}/inst && \
 		${INSTALL_DATA} ${dsktop_entry}.template \
 		${STAGEDIR}${LOCALBASE}/share/applications/${dsktop_entry})
 .endfor
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	(cd ${WRKSRC}/inst && \
 		${INSTALL_DATA} qmc2.ini.template \
 		${STAGEDIR}${ETCDIR}/qmc2.ini.sample)
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/data/doc && \
 		${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/emulators/qmc2/files/patch-src_lzma_7zCrc.c b/emulators/qmc2/files/patch-src_lzma_7zCrc.c
new file mode 100644
index 000000000000..17f415efdd35
--- /dev/null
+++ b/emulators/qmc2/files/patch-src_lzma_7zCrc.c
@@ -0,0 +1,11 @@
+--- src/lzma/7zCrc.c.orig	2022-04-29 08:33:05 UTC
++++ src/lzma/7zCrc.c
+@@ -71,7 +71,7 @@ UInt32 MY_FAST_CALL CrcUpdateT1(UInt32 v, const void *
+ 
+ #ifdef MY_CPU_LE
+ 
+-#if defined(MY_CPU_ARM_OR_ARM64)
++#if defined(MY_CPU_ARM64)
+ 
+ // #pragma message("ARM*")
+ 
diff --git a/emulators/qmc2/files/patch-src_lzma_Aes.c b/emulators/qmc2/files/patch-src_lzma_Aes.c
new file mode 100644
index 000000000000..9df1e0134247
--- /dev/null
+++ b/emulators/qmc2/files/patch-src_lzma_Aes.c
@@ -0,0 +1,11 @@
+--- src/lzma/Aes.c.orig	2022-04-29 08:33:05 UTC
++++ src/lzma/Aes.c
+@@ -55,7 +55,7 @@ static Byte InvS[256];
+ 
+ #ifdef MY_CPU_X86_OR_AMD64
+   #define USE_HW_AES
+-#elif defined(MY_CPU_ARM_OR_ARM64) && defined(MY_CPU_LE)
++#elif defined(MY_CPU_ARM) && defined(MY_CPU_LE)
+   #if defined(__clang__)
+     #if (__clang_major__ >= 8) // fix that check
+       #define USE_HW_AES
diff --git a/emulators/qmc2/files/patch-src_lzma_AesOpt.c b/emulators/qmc2/files/patch-src_lzma_AesOpt.c
new file mode 100644
index 000000000000..3519cc5af7ce
--- /dev/null
+++ b/emulators/qmc2/files/patch-src_lzma_AesOpt.c
@@ -0,0 +1,38 @@
+--- src/lzma/AesOpt.c.orig	2022-04-29 08:33:05 UTC
++++ src/lzma/AesOpt.c
+@@ -506,7 +506,7 @@ VAES_COMPAT_STUB (AesCtr_Code_HW)
+ #endif // ! USE_INTEL_VAES
+ 
+ 
+-#elif defined(MY_CPU_ARM_OR_ARM64) && defined(MY_CPU_LE)
++#elif defined(MY_CPU_ARM64) && defined(MY_CPU_LE)
+ 
+   #if defined(__clang__)
+     #if (__clang_major__ >= 8) // fix that check
+@@ -773,4 +773,25 @@ AES_FUNC_START2 (AesCtr_Code_HW)
+ 
+ #endif // USE_HW_AES
+ 
+-#endif // MY_CPU_ARM_OR_ARM64
++#else
++
++/* no USE_HW_AES */
++
++#pragma message("AES  HW_SW stub was used")
++
++#define AES_TYPE_keys UInt32
++#define AES_TYPE_data Byte
++
++#define AES_FUNC_START(name) \
++    void MY_FAST_CALL name(UInt32 *p, Byte *data, size_t numBlocks) \
++
++#define AES_COMPAT_STUB(name) \
++    AES_FUNC_START(name); \
++    AES_FUNC_START(name ## _HW) \
++    { name(p, data, numBlocks); }
++
++AES_COMPAT_STUB (AesCbc_Encode)
++AES_COMPAT_STUB (AesCbc_Decode)
++AES_COMPAT_STUB (AesCtr_Code)
++
++#endif
diff --git a/emulators/qmc2/files/patch-src_lzma_CpuArch.c b/emulators/qmc2/files/patch-src_lzma_CpuArch.c
new file mode 100644
index 000000000000..ae35cfdfe082
--- /dev/null
+++ b/emulators/qmc2/files/patch-src_lzma_CpuArch.c
@@ -0,0 +1,42 @@
+--- src/lzma/CpuArch.c.orig	2022-04-29 08:33:05 UTC
++++ src/lzma/CpuArch.c
+@@ -417,6 +417,31 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP
+ 
+ #include <sys/auxv.h>
+ 
++#if defined(__FreeBSD__)
++static unsigned long get_hwcap(int aux) {
++  unsigned long hwcap;
++  if (elf_aux_info(aux, &hwcap, sizeof hwcap) != 0) {
++        return 0;
++  }
++  return hwcap;
++}
++
++#ifdef MY_CPU_ARM64
++BoolInt CPU_IsSupported_CRC32(void) { return get_hwcap(AT_HWCAP) & HWCAP_CRC32; }
++BoolInt CPU_IsSupported_NEON(void) { return 1; }
++BoolInt CPU_IsSupported_SHA1(void){ return get_hwcap(AT_HWCAP) & HWCAP_SHA1; }
++BoolInt CPU_IsSupported_SHA2(void) { return get_hwcap(AT_HWCAP) & HWCAP_SHA2; }
++BoolInt CPU_IsSupported_AES(void) { return get_hwcap(AT_HWCAP) & HWCAP_AES; }
++#else /* MY_CPU_ARM */
++BoolInt CPU_IsSupported_CRC32(void) { return get_hwcap(AT_HWCAP2) & HWCAP2_CRC32; }
++BoolInt CPU_IsSupported_NEON(void) { return get_hwcap(AT_HWCAP) & HWCAP_NEON; }
++BoolInt CPU_IsSupported_SHA1(void){ return get_hwcap(AT_HWCAP2) & HWCAP2_SHA1; }
++BoolInt CPU_IsSupported_SHA2(void) { return get_hwcap(AT_HWCAP2) & HWCAP2_SHA2; }
++BoolInt CPU_IsSupported_AES(void) { return get_hwcap(AT_HWCAP2) & HWCAP2_AES; }
++#endif
++
++#else // __FreeBSD__
++
+ #define USE_HWCAP
+ 
+ #ifdef USE_HWCAP
+@@ -450,6 +475,7 @@ MY_HWCAP_CHECK_FUNC (SHA1)
+ MY_HWCAP_CHECK_FUNC (SHA2)
+ MY_HWCAP_CHECK_FUNC (AES)
+ 
++#endif // FreeBSD
+ #endif // __APPLE__
+ #endif // _WIN32
+ 
diff --git a/emulators/qmc2/files/patch-src_lzma_Sha256Opt.c b/emulators/qmc2/files/patch-src_lzma_Sha256Opt.c
new file mode 100644
index 000000000000..2a1acdccd036
--- /dev/null
+++ b/emulators/qmc2/files/patch-src_lzma_Sha256Opt.c
@@ -0,0 +1,11 @@
+--- src/lzma/Sha256Opt.c.orig	2022-04-29 08:33:05 UTC
++++ src/lzma/Sha256Opt.c
+@@ -212,7 +212,7 @@ void MY_FAST_CALL Sha256_UpdateBlocks_HW(UInt32 state[
+ 
+ #endif // USE_HW_SHA
+ 
+-#elif defined(MY_CPU_ARM_OR_ARM64)
++#elif defined(MY_CPU_ARM64)
+ 
+   #if defined(__clang__)
+     #if (__clang_major__ >= 8) // fix that check