diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile
index 083f98e153a6..6a355b9e46f3 100644
--- a/dns/py-dnspython/Makefile
+++ b/dns/py-dnspython/Makefile
@@ -1,32 +1,39 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 
 PORTNAME=	dnspython
-PORTVERSION=	1.16.0
+PORTVERSION=	2.2.0
 PORTEPOCH=	1
 CATEGORIES=	dns python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	DNS toolkit for Python
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:2.7-3.7 zip
-USE_PYTHON=	autoplist concurrent cython distutils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		python:3.6+
+USE_PYTHON=	autoplist cython distutils
 
 NO_ARCH=	yes
 
 PORTEXAMPLES=	ddns.py e164.py mx.py name.py reverse.py reverse_name.py xfr.py \
 		zonediff.py
 
 OPTIONS_DEFINE=			EXAMPLES PYCRYPTODOME
 PYCRYPTODOME_DESC=		Enable pycryptodome (part of dnssec needs it)
 PYCRYPTODOME_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} ${STAGEDIR}${EXAMPLESDIR}
 
+do-test:
+	cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} utest.py
+
 .include <bsd.port.mk>
diff --git a/dns/py-dnspython/distinfo b/dns/py-dnspython/distinfo
index 88b7df39d17d..b8d8bcc1b53b 100644
--- a/dns/py-dnspython/distinfo
+++ b/dns/py-dnspython/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646069762
-SHA256 (dnspython-1.16.0.zip) = 36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
-SIZE (dnspython-1.16.0.zip) = 266364
+TIMESTAMP = 1646099692
+SHA256 (dnspython-2.2.0.tar.gz) = e79351e032d0b606b98d38a4b0e6e2275b31a5b85c873e587cc11b73aca026d6
+SIZE (dnspython-2.2.0.tar.gz) = 278858