diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index 11646258f162..b474fa6b3b6d 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -1,31 +1,30 @@
 PORTNAME=	xml2rfc
-PORTVERSION=	3.5.0
+PORTVERSION=	3.17.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://tools.ietf.org/tools/xml2rfc2/cli/
+MASTER_SITES=   PYPI
+PKGNAMEPREFIX=  ${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Tool to create RFCs and related documents from XML
 WWW=		https://xml2rfc.tools.ietf.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:devel/py-lxml@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=4.9.0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}country>=1.8:devel/py-country@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:devel/py-pyflakes@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}country>=22.3.5:devel/py-country@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}intervaltree>=3.0.1:devel/py-intervaltree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-i18n-address>=2.3.2:devel/py-google-i18n-address@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5lib>=1.0.1:www/py-html5lib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.6:devel/py-kitchen@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.4:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configargparse>=1.2.3:devel/py-configargparse@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.11:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=24.2.0:devel/py-setuptools@${PY_FLAVOR}
 
-USES=		python:3.5+
+USES=		python:3.7+
 USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 .include <bsd.port.mk>
diff --git a/textproc/xml2rfc/distinfo b/textproc/xml2rfc/distinfo
index 33c0e1a0999e..20ecd657ffd3 100644
--- a/textproc/xml2rfc/distinfo
+++ b/textproc/xml2rfc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615733049
-SHA256 (xml2rfc-3.5.0.tar.gz) = 3ec836a9545f549707a8c8176038160185b9d08c1dd80304a906527da21bff68
-SIZE (xml2rfc-3.5.0.tar.gz) = 4450772
+TIMESTAMP = 1680438882
+SHA256 (xml2rfc-3.17.0.tar.gz) = 33a4a11178c791db25fdf733e04fdc28c3660c94d0fe83b3b2799ef23f547003
+SIZE (xml2rfc-3.17.0.tar.gz) = 2644479