diff --git a/textproc/py-demjson/Makefile b/textproc/py-demjson/Makefile
index 9b170e9632b..f868f83c4e4 100644
--- a/textproc/py-demjson/Makefile
+++ b/textproc/py-demjson/Makefile
@@ -1,28 +1,19 @@
-COMMENT =		encoder, decoder, and lint/validator for JSON
+COMMENT=	encoder, decoder, and lint/validator for JSON
 
-DISTNAME =		demjson-${MODPY_EGG_VERSION}
-MODPY_EGG_VERSION =	2.2.4
-MODPY_PI =		Yes
-PKGNAME =		py-${DISTNAME}
-REVISION =		9
+MODPY_EGG_VERSION=	3.0.6
+DISTNAME=	demjson3-${MODPY_EGG_VERSION}
+PKGNAME=	py-demjson-${MODPY_EGG_VERSION}
 
-CATEGORIES =	textproc devel
+CATEGORIES=	textproc devel
 
 # LGPLv3
-PERMIT_PACKAGE =	Yes
+PERMIT_PACKAGE=	Yes
 
-FLAVORS =               python3
-FLAVOR =		python3
+FLAVORS=	python3
+FLAVOR=		python3
 
-MODULES =		lang/python
-MODPY_PYBUILD =		setuptools
-
-TEST_DEPENDS +=		${FULLPKGNAME}:${FULLPKGPATH}
-
-post-patch:
-	cd ${WRKSRC} && 2to3 -w test/test_demjson.py jsonlint demjson.py
-
-do-test:
-	cd ${WRKSRC}/test && ${MODPY_BIN} -m unittest test_demjson
+MODULES=	lang/python
+MODPY_PI=	Yes
+MODPY_PYBUILD=	setuptools
 
 .include <bsd.port.mk>
diff --git a/textproc/py-demjson/distinfo b/textproc/py-demjson/distinfo
index d2f23bcaadf..a22964ea83f 100644
--- a/textproc/py-demjson/distinfo
+++ b/textproc/py-demjson/distinfo
@@ -1,2 +1,2 @@
-SHA256 (demjson-2.2.4.tar.gz) = Md4gOKD92cTBH4vzsT/ne8KhKDB/llyNX7TcbW9r63k=
-SIZE (demjson-2.2.4.tar.gz) = 131457
+SHA256 (demjson3-3.0.6.tar.gz) = N8g7DG6wjSXe/IjfCipIddWKeAmpZQvW7uev2AU826w=
+SIZE (demjson3-3.0.6.tar.gz) = 131477
diff --git a/textproc/py-demjson/patches/patch-setup_py b/textproc/py-demjson/patches/patch-setup_py
deleted file mode 100644
index 2c5618e1002..00000000000
--- a/textproc/py-demjson/patches/patch-setup_py
+++ /dev/null
@@ -1,26 +0,0 @@
-no use_2to3 in newer setuptools
-
-Index: setup.py
---- setup.py.orig
-+++ setup.py
-@@ -33,20 +33,6 @@ if False:
- 
- py3extra = {}
- 
--if py_major >= 3:
--    # Make sure 2to3 gets run
--    if distmech == 'setuptools':
--        py3extra['use_2to3'] = True
--        #py3extra['convert_2to3_doctests'] = ['src/your/module/README.txt']
--        #py3extra['use_2to3_fixers'] = ['your.fixers']
--    elif distmech == 'distutils':
--        import distutils, distutils.command, distutils.command.build_py, distutils.command.build_scripts
--        cmdclass = {
--            'build_py':      distutils.command.build_py.build_py_2to3,
--            'build_scripts': distutils.command.build_scripts.build_scripts_2to3
--            }
--        py3extra['cmdclass'] = cmdclass
--
- setup( name=name,
-        version=version,
-        py_modules=[name],
diff --git a/textproc/py-demjson/pkg/PLIST b/textproc/py-demjson/pkg/PLIST
index 0989a383a0f..afef0d3f82a 100644
--- a/textproc/py-demjson/pkg/PLIST
+++ b/textproc/py-demjson/pkg/PLIST
@@ -2,12 +2,16 @@
 @pkgpath textproc/py-demjson
 bin/jsonlint
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}demjson.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}demjson.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/demjson-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/demjson-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
-lib/python${MODPY_VERSION}/site-packages/demjson-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/demjson-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/demjson-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/demjson-${MODPY_EGG_VERSION}.dist-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/demjson.py
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}demjson3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}demjson3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}jsonlint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}jsonlint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/demjson3-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/demjson3-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/demjson3-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/demjson3-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/demjson3-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/demjson3-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/demjson3-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/demjson3.py
+lib/python${MODPY_VERSION}/site-packages/jsonlint.py