diff --git a/www/py-django42/Makefile b/www/py-django42/Makefile
index 7b50e855b839..b775be706252 100644
--- a/www/py-django42/Makefile
+++ b/www/py-django42/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	django
-PORTVERSION=	4.2.20
+PORTVERSION=	4.2.21
 CATEGORIES=	www python
 MASTER_SITES=	PYPI \
 		https://media.djangoproject.com/releases/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	42
-DISTNAME=	Django-${PORTVERSION}
+#DISTNAME=	Django-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	High-level Python Web Framework
 WWW=		https://www.djangoproject.com/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=40.8.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asgiref>=3.6.0:www/py-asgiref@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.1:databases/py-sqlparse@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tblib>0:devel/py-tblib@${PY_FLAVOR}
 
 USES=		cpe python shebangfix
 USE_PYTHON=	autoplist pep517
 
 NO_ARCH=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
 PLIST_FILES=	share/man/man1/django-admin.1.gz
 PORTDOCS=	*
 
 SHEBANG_FILES=	django/conf/project_template/manage.py-tpl
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django[0-9][0-9]
 
 CPE_VENDOR=	djangoproject
 
 # Upstream archive contains files with UTF-8 names
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 
 OPTIONS_DEFINE=	DOCS HTMLDOCS
 OPTIONS_GROUP=	DATABASE
 OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 OPTIONS_DEFAULT=SQLITE
 HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 HTMLDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 HTMLDOCS_IMPLIES=	DOCS
 HTMLDOCS_USES=		gmake
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.13:databases/py-mysqlclient@${PY_FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${MAKE_CMD} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${PREFIX}/share/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"	* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
 
 post-install-HTMLDOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR}
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} tests/runtests.py --settings=test_sqlite
 
 .include <bsd.port.mk>
diff --git a/www/py-django42/distinfo b/www/py-django42/distinfo
index 38b231f556b2..77609490bbb7 100644
--- a/www/py-django42/distinfo
+++ b/www/py-django42/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741314788
-SHA256 (python/Django-4.2.20.tar.gz) = 92bac5b4432a64532abb73b2ac27203f485e40225d2640a7fbef2b62b876e789
-SIZE (python/Django-4.2.20.tar.gz) = 10432686
+TIMESTAMP = 1746746510
+SHA256 (python/django-4.2.21.tar.gz) = b54ac28d6aa964fc7c2f7335138a54d78980232011e0cd2231d04eed393dcb0d
+SIZE (python/django-4.2.21.tar.gz) = 10424638
diff --git a/www/py-django42/files/patch-pyproject.toml b/www/py-django42/files/patch-pyproject.toml
new file mode 100644
index 000000000000..9d523c72c390
--- /dev/null
+++ b/www/py-django42/files/patch-pyproject.toml
@@ -0,0 +1,17 @@
+--- pyproject.toml.orig	2025-05-09 00:23:23 UTC
++++ pyproject.toml
+@@ -1,12 +1,12 @@ requires = [
+ [build-system]
+ requires = [
+-    "setuptools>=75.8.1; python_version >= '3.9'",
++    "setuptools>=63; python_version >= '3.9'",
+     "setuptools<75.4.0; python_version < '3.9'",
+ ]
+ build-backend = "setuptools.build_meta"
+ 
+ [project]
+-name = "Django"
++name = "django"
+ dynamic = ["version"]
+ requires-python = ">= 3.8"
+ dependencies = [
diff --git a/www/py-django42/files/patch-setup.cfg b/www/py-django42/files/patch-setup.cfg
deleted file mode 100644
index d014f0b13d57..000000000000
--- a/www/py-django42/files/patch-setup.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
---- setup.cfg.orig	2024-05-08 00:21:05 UTC
-+++ setup.cfg
-@@ -1,5 +1,5 @@
- [metadata]
--name = Django
-+name = django
- version = attr: django.__version__
- url = https://www.djangoproject.com/
- author = Django Software Foundation