diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index 8de8ea6498e6..ca0f920a73d6 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2016/06/08 17:43:44 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2016/09/12 17:44:14 adam Exp $
 
-DISTNAME=	CherryPy-3.8.0
+DISTNAME=	CherryPy-8.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=C/CherryPy/}
@@ -15,6 +15,8 @@ USE_LANGUAGES=		# none
 REPLACE_PYTHON=		cherrypy/cherryd
 REPLACE_PYTHON+=	cherrypy/test/sessiondemo.py
 
+DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-cherrypy/PLIST b/www/py-cherrypy/PLIST
index 76064f89b486..a8a0e7ab8bfa 100644
--- a/www/py-cherrypy/PLIST
+++ b/www/py-cherrypy/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2015/08/01 08:17:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/09/12 17:44:14 adam Exp $
 bin/cherryd
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/cherrypy/LICENSE.txt
 ${PYSITELIB}/cherrypy/__init__.py
@@ -62,6 +63,9 @@ ${PYSITELIB}/cherrypy/_cpwsgi.pyo
 ${PYSITELIB}/cherrypy/_cpwsgi_server.py
 ${PYSITELIB}/cherrypy/_cpwsgi_server.pyc
 ${PYSITELIB}/cherrypy/_cpwsgi_server.pyo
+${PYSITELIB}/cherrypy/_helper.py
+${PYSITELIB}/cherrypy/_helper.pyc
+${PYSITELIB}/cherrypy/_helper.pyo
 ${PYSITELIB}/cherrypy/cherryd
 ${PYSITELIB}/cherrypy/daemon.pyc
 ${PYSITELIB}/cherrypy/daemon.pyo
@@ -97,9 +101,6 @@ ${PYSITELIB}/cherrypy/lib/encoding.pyo
 ${PYSITELIB}/cherrypy/lib/gctools.py
 ${PYSITELIB}/cherrypy/lib/gctools.pyc
 ${PYSITELIB}/cherrypy/lib/gctools.pyo
-${PYSITELIB}/cherrypy/lib/http.py
-${PYSITELIB}/cherrypy/lib/http.pyc
-${PYSITELIB}/cherrypy/lib/http.pyo
 ${PYSITELIB}/cherrypy/lib/httpauth.py
 ${PYSITELIB}/cherrypy/lib/httpauth.pyc
 ${PYSITELIB}/cherrypy/lib/httpauth.pyo
@@ -254,6 +255,9 @@ ${PYSITELIB}/cherrypy/test/test_misc_tools.pyo
 ${PYSITELIB}/cherrypy/test/test_objectmapping.py
 ${PYSITELIB}/cherrypy/test/test_objectmapping.pyc
 ${PYSITELIB}/cherrypy/test/test_objectmapping.pyo
+${PYSITELIB}/cherrypy/test/test_params.py
+${PYSITELIB}/cherrypy/test/test_params.pyc
+${PYSITELIB}/cherrypy/test/test_params.pyo
 ${PYSITELIB}/cherrypy/test/test_proxy.py
 ${PYSITELIB}/cherrypy/test/test_proxy.pyc
 ${PYSITELIB}/cherrypy/test/test_proxy.pyo
@@ -290,6 +294,9 @@ ${PYSITELIB}/cherrypy/test/test_virtualhost.pyo
 ${PYSITELIB}/cherrypy/test/test_wsgi_ns.py
 ${PYSITELIB}/cherrypy/test/test_wsgi_ns.pyc
 ${PYSITELIB}/cherrypy/test/test_wsgi_ns.pyo
+${PYSITELIB}/cherrypy/test/test_wsgi_unix_socket.py
+${PYSITELIB}/cherrypy/test/test_wsgi_unix_socket.pyc
+${PYSITELIB}/cherrypy/test/test_wsgi_unix_socket.pyo
 ${PYSITELIB}/cherrypy/test/test_wsgi_vhost.py
 ${PYSITELIB}/cherrypy/test/test_wsgi_vhost.pyc
 ${PYSITELIB}/cherrypy/test/test_wsgi_vhost.pyo
@@ -348,9 +355,3 @@ ${PYSITELIB}/cherrypy/wsgiserver/ssl_builtin.pyo
 ${PLIST.py2x}${PYSITELIB}/cherrypy/wsgiserver/ssl_pyopenssl.py
 ${PLIST.py2x}${PYSITELIB}/cherrypy/wsgiserver/ssl_pyopenssl.pyc
 ${PLIST.py2x}${PYSITELIB}/cherrypy/wsgiserver/ssl_pyopenssl.pyo
-${PLIST.py2x}${PYSITELIB}/cherrypy/wsgiserver/wsgiserver2.py
-${PLIST.py2x}${PYSITELIB}/cherrypy/wsgiserver/wsgiserver2.pyc
-${PLIST.py2x}${PYSITELIB}/cherrypy/wsgiserver/wsgiserver2.pyo
-${PLIST.py3x}${PYSITELIB}/cherrypy/wsgiserver/wsgiserver3.py
-${PLIST.py3x}${PYSITELIB}/cherrypy/wsgiserver/wsgiserver3.pyc
-${PLIST.py3x}${PYSITELIB}/cherrypy/wsgiserver/wsgiserver3.pyo
diff --git a/www/py-cherrypy/distinfo b/www/py-cherrypy/distinfo
index 213dd5fa3ba5..f7dd91dc972b 100644
--- a/www/py-cherrypy/distinfo
+++ b/www/py-cherrypy/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 02:47:24 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/09/12 17:44:14 adam Exp $
 
-SHA1 (CherryPy-3.8.0.tar.gz) = 91749ba9923e53cc4f2ce11577852cb050a53ec3
-RMD160 (CherryPy-3.8.0.tar.gz) = 982446b7c0319509969616d8269f6c25fcfe7aa1
-SHA512 (CherryPy-3.8.0.tar.gz) = 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
-Size (CherryPy-3.8.0.tar.gz) = 433711 bytes
+SHA1 (CherryPy-8.1.0.tar.gz) = f144c8508783d2c67a61f67cb5f5b6d5c657c38a
+RMD160 (CherryPy-8.1.0.tar.gz) = ab28a912e3f30456824b0d48aa67cc263b5aab98
+SHA512 (CherryPy-8.1.0.tar.gz) = 967374231337089bfa3f45ec1be9cf5b3f8b7040d78887a15aac298995218369ea6cb0127cac85af290aa45fe709e0e3c4e1a228b9559ba14054ac778ccca0fb
+Size (CherryPy-8.1.0.tar.gz) = 724428 bytes