diff --git a/www/py-django-dpaste/Makefile b/www/py-django-dpaste/Makefile
index 1881440e6fa6..631705d4903a 100644
--- a/www/py-django-dpaste/Makefile
+++ b/www/py-django-dpaste/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	dpaste
-PORTVERSION=	2.9
-PORTREVISION=	1
+PORTVERSION=	2.10
 CATEGORIES=	www python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
 
 MAINTAINER=	koobs@FreeBSD.org
@@ -14,7 +14,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.7.4:www/py-django-mptt \
+		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.8.3:www/py-django-mptt \
 		${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests
 
@@ -25,12 +25,11 @@ MIGRATIONS_DESC=	Schema and data migration support (via south)
 MIGRATIONS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}south>=0.8.2:databases/py-south
 
 USES=		python
-USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
-GH_ACCOUNT=	bartTC
+NO_ARCH=	yes
 
-regression-test: build
-	@cd ${WRKSRC} && ${PYTHON_CMD} runtests.py
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
diff --git a/www/py-django-dpaste/distinfo b/www/py-django-dpaste/distinfo
index 8539f67ea69d..cd09ed758b94 100644
--- a/www/py-django-dpaste/distinfo
+++ b/www/py-django-dpaste/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bartTC-dpaste-2.9_GH0.tar.gz) = 1e8d44619cf7fba61a3771783890f304bee98e2fc5ccba2cea14766bd008deba
-SIZE (bartTC-dpaste-2.9_GH0.tar.gz) = 147108
+TIMESTAMP = 1471231865
+SHA256 (dpaste-2.10.tar.gz) = 6b24217865194c7a3036cd4f50d12a5f11de28b879ac74593aff810bb89a5d58
+SIZE (dpaste-2.10.tar.gz) = 128149
diff --git a/www/py-django-dpaste/files/patch-runtests.py b/www/py-django-dpaste/files/patch-runtests.py
new file mode 100644
index 000000000000..e675cbbb404e
--- /dev/null
+++ b/www/py-django-dpaste/files/patch-runtests.py
@@ -0,0 +1,12 @@
+--- runtests.py.orig	2016-08-15 03:40:49 UTC
++++ runtests.py
+@@ -63,8 +63,7 @@ def runtests(*test_args):
+ 
+     test_runner = TestRunner(verbosity=1)
+     failures = test_runner.run_tests(['dpaste'])
+-    if failures:
+-        sys.exit(failures)
++    sys.exit(failures)
+ 
+ if __name__ == '__main__':
+     runtests(*sys.argv[1:])
diff --git a/www/py-django-dpaste/files/patch-setup.py b/www/py-django-dpaste/files/patch-setup.py
new file mode 100644
index 000000000000..afd0a3900474
--- /dev/null
+++ b/www/py-django-dpaste/files/patch-setup.py
@@ -0,0 +1,34 @@
+--- setup.py.orig	2016-08-15 03:37:55 UTC
++++ setup.py
+@@ -4,19 +4,6 @@ from sys import exit
+ from setuptools import find_packages, setup
+ from setuptools.command.test import test as TestCommand
+ 
+-
+-class Tox(TestCommand):
+-    def finalize_options(self):
+-        TestCommand.finalize_options(self)
+-        self.test_args = []
+-        self.test_suite = True
+-
+-    def run_tests(self):
+-        #import here, cause outside the eggs aren't loaded
+-        import tox
+-        errno = tox.cmdline(self.test_args)
+-        exit(errno)
+-
+ long_description = u'\n\n'.join((
+     open('README.rst').read(),
+     open('CHANGELOG').read()
+@@ -54,10 +41,5 @@ setup(
+         'pygments>=1.6',
+         'requests>=2.0.0',
+     ],
+-    tests_require=[
+-        'tox>=1.6.1'
+-    ],
+-    cmdclass={
+-        'test': Tox
+-    },
++    test_suite='runtests.runtests',
+ )