diff --git a/security/apkid/Makefile b/security/apkid/Makefile
index 73470c7cc4db..934976ead028 100644
--- a/security/apkid/Makefile
+++ b/security/apkid/Makefile
@@ -1,35 +1,35 @@
 # Created by: thierry@pompo.net
 
 PORTNAME=	APKiD
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Android Application Identifier
 
 LICENSE=	GPLv3 RedNaga
 LICENSE_COMB=	dual
 LICENSE_NAME_RedNaga=	Commercial
 LICENSE_FILE_RedNaga=	${WRKSRC}/LICENSE.COMMERCIAL
 LICENSE_PERMS_RedNaga=	pkg-mirror pkg-sell
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rednaga
 
 USES=		python:3.7+
 USE_PYTHON=	distutils
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yara>0:security/py-yara@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yara>0:security/py-yara@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yara-python-dex>0:security/py-yara-python-dex@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yara-python-dex>0:security/py-yara-python-dex@${PY_FLAVOR}
 
 PLIST_SUB=	VER=${PORTVERSION}
 NO_ARCH=	yes
 
 post-install:
 	(cd ${WRKSRC} && ${PYTHON_CMD} ./prep-release.py)
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/apkid/rules
 	${CP} ${WRKSRC}/apkid/rules/rules.yarc	\
 		${STAGEDIR}${PYTHON_SITELIBDIR}/apkid/rules/
 
 .include <bsd.port.mk>
diff --git a/security/apkid/distinfo b/security/apkid/distinfo
index 087bcc1113ad..f0dc929d6df4 100644
--- a/security/apkid/distinfo
+++ b/security/apkid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613499348
-SHA256 (rednaga-APKiD-v2.1.1_GH0.tar.gz) = a6c96a4eae236748feef8a0b5cbdb3879f5e97d6f114d737ef39b468fb0d5038
-SIZE (rednaga-APKiD-v2.1.1_GH0.tar.gz) = 55685
+TIMESTAMP = 1649784250
+SHA256 (rednaga-APKiD-v2.1.3_GH0.tar.gz) = ca459365c3c02374691bc3c6dc42bd4c6cda2567cb9f34ea71b75ef94ba248ab
+SIZE (rednaga-APKiD-v2.1.3_GH0.tar.gz) = 59856
diff --git a/security/apkid/files/patch-setup.cfg b/security/apkid/files/patch-setup.cfg
new file mode 100644
index 000000000000..18834493dc8e
--- /dev/null
+++ b/security/apkid/files/patch-setup.cfg
@@ -0,0 +1,8 @@
+--- setup.cfg.orig	2022-04-06 18:11:23 UTC
++++ setup.cfg
+@@ -2,4 +2,4 @@
+ universal=1
+ 
+ [metadata]
+-description-file = README.md
++description_file = README.md
diff --git a/security/apkid/files/patch-setup.py b/security/apkid/files/patch-setup.py
deleted file mode 100644
index 7f62ae898cf9..000000000000
--- a/security/apkid/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2020-11-12 18:52:12 UTC
-+++ setup.py
-@@ -47,7 +47,7 @@ def package_files(directory):
- 
- 
- install_requires = [
--    'yara-python==3.11.0',
-+    'yara-python>=3.11.0',
- ]
- 
- dev_requires = [