diff --git a/srcpkgs/python-CherryPy/template b/srcpkgs/python-CherryPy/template
index f864313b519..79f00c7f77a 100644
--- a/srcpkgs/python-CherryPy/template
+++ b/srcpkgs/python-CherryPy/template
@@ -1,12 +1,11 @@
 # Template file for 'python-CherryPy'
 pkgname=python-CherryPy
 version=8.1.2
-revision=2
+revision=3
 noarch=yes
 wrksrc="CherryPy-${version}"
 build_style=python-module
-python_versions="2.7 3.4"
-hostmakedepends="python-setuptools python3.4-setuptools"
+hostmakedepends="python-setuptools python3-setuptools"
 depends="python-six"
 pycompile_module="cherrypy"
 short_desc="Object-oriented HTTP framework (Python2)"
@@ -15,22 +14,28 @@ license="3-clause-BSD"
 homepage="http://www.cherrypy.org"
 distfiles="${PYPI_SITE}/C/CherryPy/CherryPy-${version}.tar.gz"
 checksum=45a92fdd18baa19d055e5f53bb3c4293821a30e83bf3c5244b867685397f5380
-alternatives="cherrypy:cherryd:/usr/bin/cherryd2.7"
+alternatives="cherrypy:cherryd:/usr/bin/cherryd2"
 
 post_install() {
 	vlicense cherrypy/LICENSE.txt
 }
 
-python3.4-CherryPy_package() {
+python3-CherryPy_package() {
 	noarch=yes
-	depends="python3.4-six"
-	pycompile_version="3.4"
+	depends="python3-six"
 	pycompile_module="cherrypy"
-	short_desc="${short_desc/Python2/Python3.4}"
-	alternatives="cherrypy:cherryd:/usr/bin/cherryd3.4"
+	replaces="python3.4-CherryPy>=0"
+	short_desc="${short_desc/Python2/Python3}"
+	alternatives="cherrypy:cherryd:/usr/bin/cherryd3"
 	pkg_install() {
-		vmove usr/bin/cherryd3.4
-		vmove usr/lib/python3.4
+		vmove usr/bin/cherryd3
+		vmove usr/lib/python3*
 		vlicense cherrypy/LICENSE.txt
 	}
 }
+python3.4-CherryPy_package() {
+	noarch=yes
+	build_style=meta
+	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
+	depends="python3-CherryPy>=${version}_${revision}"
+}
diff --git a/srcpkgs/python3-CherryPy b/srcpkgs/python3-CherryPy
new file mode 120000
index 00000000000..1a003f89e43
--- /dev/null
+++ b/srcpkgs/python3-CherryPy
@@ -0,0 +1 @@
+python-CherryPy
\ No newline at end of file