diff --git a/www/py-flask-wtf/Makefile b/www/py-flask-wtf/Makefile
index 8ba496ebbcb2..3ab9d41f2923 100644
--- a/www/py-flask-wtf/Makefile
+++ b/www/py-flask-wtf/Makefile
@@ -1,34 +1,33 @@
-PORTNAME=	Flask-WTF
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTNAME=	flask_wtf
+DISTVERSION=	1.2.1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Simple integration of Flask and WTForms
 WWW=		https://flask-wtf.readthedocs.org/en/latest/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
-		${PY_SETUPTOOLS}
-
+		${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flask>0:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}itsdangerous>0:security/py-itsdangerous@${PY_FLAVOR}
-
-# Tests were rewritten for pytest, needs update
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flask-babel>0:devel/py-flask-babel@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist pep517
+USE_PYTHON=	autoplist pep517 pytest
 
 NO_ARCH=	yes
 
-do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+OPTIONS_DEFINE=		EMAIL
+OPTIONS_DEFAULT=	EMAIL
+
+EMAIL_DESC=		Form email validation
+EMAIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}email-validator>=0:mail/py-email-validator@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/www/py-flask-wtf/distinfo b/www/py-flask-wtf/distinfo
index 7c6d200eee36..422b0faf24b5 100644
--- a/www/py-flask-wtf/distinfo
+++ b/www/py-flask-wtf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685643384
-SHA256 (Flask-WTF-1.1.1.tar.gz) = 41c4244e9ae626d63bed42ae4785b90667b885b1535d5a4095e1f63060d12aa9
-SIZE (Flask-WTF-1.1.1.tar.gz) = 52303
+TIMESTAMP = 1708273768
+SHA256 (flask_wtf-1.2.1.tar.gz) = 8bb269eb9bb46b87e7c8233d7e7debdf1f8b74bf90cc1789988c29b37a97b695
+SIZE (flask_wtf-1.2.1.tar.gz) = 42498