diff --git a/security/py-pycryptodome/Makefile b/security/py-pycryptodome/Makefile
index bd3e0b5d56a3..8dce5f756172 100644
--- a/security/py-pycryptodome/Makefile
+++ b/security/py-pycryptodome/Makefile
@@ -1,5 +1,5 @@
-PORTNAME=	pycryptodome
-DISTVERSION=	3.19.0
+PORTNAME?=	pycryptodome
+DISTVERSION=	3.20.0
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,14 +12,17 @@ LICENSE=	APACHE20 BSD2CLAUSE PD
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycryptodome-test-vectors>=0:security/py-pycryptodome-test-vectors@${PY_FLAVOR}
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycryptodome-test-vectors>=0:security/py-pycryptodome-test-vectors@${PY_FLAVOR} \
+		gmp>=0:math/gmp
 
 # Officially: 2.7, 3.5-3.12
 USES=		cpe python
 CPE_VENDOR=	python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist pep517
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pycrypto
+CONFLICTS_INSTALL?=	${PYTHON_PKGNAMEPREFIX}pycrypto
 
 NAMESPACE?=	Crypto
 
diff --git a/security/py-pycryptodome/distinfo b/security/py-pycryptodome/distinfo
index 6d87e76dbeb0..70cbdbf51cc6 100644
--- a/security/py-pycryptodome/distinfo
+++ b/security/py-pycryptodome/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695505818
-SHA256 (pycryptodome-3.19.0.tar.gz) = bc35d463222cdb4dbebd35e0784155c81e161b9284e567e7e933d722e533331e
-SIZE (pycryptodome-3.19.0.tar.gz) = 4778190
+TIMESTAMP = 1706557466
+SHA256 (pycryptodome-3.20.0.tar.gz) = 09609209ed7de61c2b560cc5c8c4fbf892f8b15b1faf7e4cbffac97db1fffda7
+SIZE (pycryptodome-3.20.0.tar.gz) = 4794232
diff --git a/security/py-pycryptodomex/Makefile b/security/py-pycryptodomex/Makefile
index bd9dbfab18d0..cf2bd6fad6af 100644
--- a/security/py-pycryptodomex/Makefile
+++ b/security/py-pycryptodomex/Makefile
@@ -1,12 +1,10 @@
-PKGNAMESUFFIX=	x
+PORTNAME=	pycryptodomex
 
 CONFLICTS_INSTALL=
 
 MASTERDIR=	${.CURDIR}/../py-pycryptodome
+DISTINFO_FILE=	${.CURDIR}/distinfo
 
 NAMESPACE=	Cryptodome
 
-pre-build:
-	@${TOUCH} ${WRKSRC}/.separate_namespace
-
 .include "${MASTERDIR}/Makefile"
diff --git a/security/py-pycryptodomex/distinfo b/security/py-pycryptodomex/distinfo
new file mode 100644
index 000000000000..60be8a89acff
--- /dev/null
+++ b/security/py-pycryptodomex/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1706557470
+SHA256 (pycryptodomex-3.20.0.tar.gz) = 7a710b79baddd65b806402e14766c721aee8fb83381769c27920f26476276c1e
+SIZE (pycryptodomex-3.20.0.tar.gz) = 4794613