diff --git a/security/libpki/Makefile b/security/libpki/Makefile
index 61dada047acb..1b6ec397730e 100644
--- a/security/libpki/Makefile
+++ b/security/libpki/Makefile
@@ -1,60 +1,59 @@
 PORTNAME=	libpki
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 
 PATCH_SITES=	https://github.com/openca/libpki/commit/
 PATCHFILES=	d7617046e9da97473a140c02582fa571f6359ae3.patch:-p1
 
 MAINTAINER=	bruno@ruomad.net
 COMMENT=	OpenCA PKI library (libpki) and tools
 WWW=		https://www.openca.org/projects/libpki
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-NOT_FOR_ARCHS=	arm64
-
 USES=		autoreconf gnome libtool ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	openca
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--disable-iphone
 
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
 
 OPTIONS_DEFINE=	DNS LDAP MYSQL PGSQL
 
 DNS_DESC=	"Enable DNS support"
 LDAP_DESC=	"Enable LDAP support"
 MYSQL_DESC=	"Enable MySQL support"
 PGSQL_DESC=	"Enable PostgreSQL support"
 
 DNS_CONFIGURE_ENABLE=	dns
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_ENABLE=	ldap
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ENABLE=	mysql
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ENABLE=	pg
 
 post-stage:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc; \
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki; \
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/hsm.d; \
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/profile.d; \
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/store.d; \
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/token.d; \
 	${MV} ${STAGEDIR}${PREFIX}/etc/pki.conf ${STAGEDIR}${PREFIX}/share/libpki/etc/pki.conf.sample; \
 	cd ${STAGEDIR}${PREFIX}/etc/libpki; \
 	for f in $$(find * -type f); do \
 		${MV} ${STAGEDIR}${PREFIX}/etc/libpki/$$f ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/$$f.sample; \
 	done; \
 	${RM} -rf ${STAGEDIR}${PREFIX}/include/internal
 
 .include <bsd.port.mk>
diff --git a/security/libpki/files/patch-configure.ac b/security/libpki/files/patch-configure.ac
new file mode 100644
index 000000000000..ae82272a6772
--- /dev/null
+++ b/security/libpki/files/patch-configure.ac
@@ -0,0 +1,13 @@
+--- configure.ac.orig	2022-10-10 19:42:21 UTC
++++ configure.ac
+@@ -40,6 +40,9 @@
+     mybits="64"
+     mybits_install="64"
+         ;;
++  *arm)
++    mybits="32"
++    ;;
+-  *aarch64)
++  *aarch64|*arm64)
+     mybits="64"
+     mybits_install="64"