diff --git a/www/py-django-dpaste/Makefile b/www/py-django-dpaste/Makefile
index 7fb59b7839b6..6fd59a263319 100644
--- a/www/py-django-dpaste/Makefile
+++ b/www/py-django-dpaste/Makefile
@@ -1,33 +1,36 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 
 PORTNAME=	dpaste
-PORTVERSION=	3.3.1
-PORTREVISION=	1
+PORTVERSION=	3.5
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Django based pastebin for text and code
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django-csp>=3.3:www/py-django-csp@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj-database-url>=0.5.0:www/py-dj-database-url@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django-csp>=3.6:www/py-django-csp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-staticinline>=1.0:www/py-django-staticinline@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jsx-lexer>=0.0.7:textproc/py-jsx-lexer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}misaka>=2.1.0:textproc/py-misaka@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}jsx-lexer>=0.0.8:textproc/py-jsx-lexer@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}misaka>=2.1.0:textproc/py-misaka@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-django>0:devel/py-pytest-django@${PY_FLAVOR}
 
-USES=		python:3.4+
+USES=		python:3.6-3.10
 USE_PYTHON=	distutils autoplist
 
+TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+
 NO_ARCH=	yes
 
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} runtests.py
+	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs --ds=dpaste.settings.tests -o addopts=
 
 .include <bsd.port.mk>
diff --git a/www/py-django-dpaste/distinfo b/www/py-django-dpaste/distinfo
index ed0d0cde46bf..e3a720dd9869 100644
--- a/www/py-django-dpaste/distinfo
+++ b/www/py-django-dpaste/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567751862
-SHA256 (dpaste-3.3.1.tar.gz) = 398bd5522fbaf7dde93ebaa224e033d0c7e5ecd70d3f32b275d80a978db0196a
-SIZE (dpaste-3.3.1.tar.gz) = 218357
+TIMESTAMP = 1644784695
+SHA256 (dpaste-3.5.tar.gz) = cbcb510a533fcd78e71ca828a2f59b952ed0f4376ca23707652db9f837b19818
+SIZE (dpaste-3.5.tar.gz) = 216749
diff --git a/www/py-django-dpaste/files/patch-setup.cfg b/www/py-django-dpaste/files/patch-setup.cfg
deleted file mode 100644
index aa2d71226348..000000000000
--- a/www/py-django-dpaste/files/patch-setup.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-From 02a6812c80a7471cffd0e82b5093ac6e7a783bcd Mon Sep 17 00:00:00 2001
-From: Martin Mahner <martin@mahner.org>
-Date: Wed, 8 Jan 2020 13:12:28 +0100
-Subject: [PATCH] Dependency updates and cleanup.
-
---- setup.cfg.orig	2020-09-28 02:16:26 UTC
-+++ setup.cfg
-@@ -35,7 +35,7 @@ install_requires = 
- 	django-staticinline>=1.0
- 	django-csp>=3.3
- 	
--	jsx-lexer==0.0.7
-+	jsx-lexer>=0.0.7
- 	misaka>=2.1.0
- 	docutils
- 	
diff --git a/www/py-django-dpaste/pkg-descr b/www/py-django-dpaste/pkg-descr
index 2f4f77f1dda9..59934a9be28a 100644
--- a/www/py-django-dpaste/pkg-descr
+++ b/www/py-django-dpaste/pkg-descr
@@ -1,5 +1,5 @@
 dpaste is a Django based pastebin. It's intended to run separately but its
 also possible to be installed into an existing Django project like a regular
 app. You can find a live example on dpaste.de
 
-WWW: https://github.com/bartTC/dpaste
+WWW: https://github.com/DarrenOfficial/dpaste