diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index e8d9a0c5e874..b26d1fb2bcec 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cherrypy
-PORTVERSION=	3.2.0
+PORTVERSION=	3.2.2
 PORTREVISION=	0
 CATEGORIES=	www python
 MASTER_SITES=	http://download.cherrypy.org/cherrypy/${PORTVERSION}/ \
@@ -17,42 +17,32 @@ DISTNAME=	CherryPy-${PORTVERSION}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A pythonic, object-oriented web development framework
 
-#RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.0.0:${PORTSDIR}/devel/py-nose
 .if !defined(NOPORTEXAMPLES)
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:${PORTSDIR}/devel/py-cheetah
 
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 .endif
 
-.if !defined(NO_INSTALL_MANPAGES)
-MAN1=	cherryd.1
-.endif
-
-PLIST_SUB=	PY2=${PY2}
-
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	CherryPy
 
-PYVER=	${PYTHON_PKGNAMEPREFIX:C/[0-9]-$//1}
-PY2FILES=	native-server.ini fastcgi.conf
+PLIST_SUB=	PY2=${PY2} PYMAJORVER=${PYMAJORVER}
+
+PYMAJORVER=	${PYTHON_VER:R}
 
 .include <bsd.port.pre.mk>
 
 post-install:
-.if !defined(NO_INSTALL_MANPAGES)
-	${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${MANPREFIX}/man/man1
-.endif
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
 	cd ${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG}/${PORTNAME} && ${COPYTREE_SHARE} tutorial ${EXAMPLESDIR}
 .endif
 	${RM} -R ${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG}/${PORTNAME}/tutorial
-.if ${PYVER} == py2
-	cd ${WRKSRC}/${PYVER}/${PORTNAME}/test && ${INSTALL_DATA} ${PY2FILES} ${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG}/cherrypy/test/
+.if ${PYMAJORVER} == 2
 PY2=''
 .else
-PY2=@comment
+PY2='@comment '
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/py-cherrypy/distinfo b/www/py-cherrypy/distinfo
index b1f3f6a9bb5d..a5643575bfde 100644
--- a/www/py-cherrypy/distinfo
+++ b/www/py-cherrypy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (CherryPy-3.2.0.tar.gz) = 0a70d163ee33b892df064ab70d097d0fc125c74fc0c6da418b2964bb1d6d18fe
-SIZE (CherryPy-3.2.0.tar.gz) = 921937
+SHA256 (CherryPy-3.2.2.tar.gz) = dc5a88562795c2ee462dac5b37aba1cf4f34f3e27281ec11049227039308b691
+SIZE (CherryPy-3.2.2.tar.gz) = 414099
diff --git a/www/py-cherrypy/pkg-plist b/www/py-cherrypy/pkg-plist
index 336a0241fe62..ea7e7ac4255b 100644
--- a/www/py-cherrypy/pkg-plist
+++ b/www/py-cherrypy/pkg-plist
@@ -43,9 +43,9 @@ bin/cherryd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/_cpserver.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/_cpserver.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/_cpserver.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/_cpthreadinglocal.py
-%%PY2%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/_cpthreadinglocal.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/_cpthreadinglocal.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/_cpthreadinglocal.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/_cpthreadinglocal.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/_cpthreadinglocal.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/_cptools.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/_cptools.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/_cptools.pyo
@@ -87,9 +87,12 @@ bin/cherryd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/encoding.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/encoding.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/encoding.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/http.py
-%%PY2%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/http.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/http.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/gctools.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/gctools.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/gctools.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/http.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/http.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/http.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/httpauth.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/httpauth.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/httpauth.pyo
@@ -111,9 +114,9 @@ bin/cherryd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/static.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/static.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/static.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/xmlrpc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/xmlrpc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/xmlrpc.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/xmlrpcutil.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/xmlrpcutil.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/lib/xmlrpcutil.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/process/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/process/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/process/__init__.pyo
@@ -150,7 +153,6 @@ bin/cherryd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/checkerdemo.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/checkerdemo.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/checkerdemo.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/fastcgi.conf
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/helper.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/helper.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/helper.pyo
@@ -169,7 +171,6 @@ bin/cherryd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/modwsgi.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/modwsgi.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/modwsgi.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/native-server.ini
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/sessiondemo.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/sessiondemo.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/test/sessiondemo.pyo
@@ -291,6 +292,9 @@ bin/cherryd
 %%PY2%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/wsgiserver/ssl_pyopenssl.py
 %%PY2%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/wsgiserver/ssl_pyopenssl.pyc
 %%PY2%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/wsgiserver/ssl_pyopenssl.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/wsgiserver/wsgiserver%%PYMAJORVER%%.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/wsgiserver/wsgiserver%%PYMAJORVER%%.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cherrypy/wsgiserver/wsgiserver%%PYMAJORVER%%.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/README.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/__init__.pyc