diff --git a/www/py-django-contact-form/Makefile b/www/py-django-contact-form/Makefile
index 8b6750bff4bf..d8519816da89 100644
--- a/www/py-django-contact-form/Makefile
+++ b/www/py-django-contact-form/Makefile
@@ -1,25 +1,28 @@
 PORTNAME=	django-contact-form
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Generic contact-form application for Django
 WWW=		https://github.com/ubernostrum/django-contact-form
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=3.2:www/py-django32@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent pep517
+
+TEST_ENV=	DJANGO_SETTINGS_MODULE=tests.settings PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 do-test:
-	cd ${WRKSRC} && ${PYTHON_CMD} runtests.py
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} runtests.py
 
 .include <bsd.port.mk>
diff --git a/www/py-django-contact-form/distinfo b/www/py-django-contact-form/distinfo
index 6a86302c871a..b11ccbbc9f5b 100644
--- a/www/py-django-contact-form/distinfo
+++ b/www/py-django-contact-form/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1654774118
-SHA256 (django-contact-form-2.0.1.tar.gz) = 9fcf109efed4ba9ceaca3f6f930a12d4c1167eb02758aabac5d7593d41bdaf8d
-SIZE (django-contact-form-2.0.1.tar.gz) = 28069
+TIMESTAMP = 1705471356
+SHA256 (django-contact-form-2.1.tar.gz) = 7202488b6f1ba331a1dc9ae052ddd2129760e00ccf5ebb2dd95a42974a6fdb75
+SIZE (django-contact-form-2.1.tar.gz) = 30042