diff --git a/srcpkgs/python-CherryPy/template b/srcpkgs/python-CherryPy/template
index 385a5a814b7..4da4c2f5e13 100644
--- a/srcpkgs/python-CherryPy/template
+++ b/srcpkgs/python-CherryPy/template
@@ -1,20 +1,35 @@
-# Template file for 'python-cherry'
-_realname=CherryPy
-pkgname=python-${_realname}
+# Template file for 'python-CherryPy'
+pkgname=python-CherryPy
 version=5.0.1
-revision=1
-wrksrc="${_realname}-${version}"
-build_style=python-module
+revision=2
 noarch=yes
-hostmakedepends="python"
-pycompile_module="${_realname}"
-short_desc="A pythonic, object-oriented web development framework"
+wrksrc="CherryPy-${version}"
+build_style=python-module
+python_versions="2.7 3.4"
+hostmakedepends="python-setuptools python3.4-setuptools"
+depends="python"
+pycompile_module="cherrypy"
+short_desc="Object-oriented HTTP framework (Python2)"
 maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
-license="BSD"
+license="3-clause-BSD"
 homepage="http://www.cherrypy.org"
-distfiles="${PYPI_SITE}/${_realname:0:1}/${_realname}/${_realname}-${version}.tar.gz"
+distfiles="${PYPI_SITE}/C/CherryPy/CherryPy-${version}.tar.gz"
 checksum=6dd6a3c2890ff613b92c597126f548d41a59024448ae3439a1dba08013610403
 
 post_install() {
 	vlicense cherrypy/LICENSE.txt
+	vbin build-3.4/scripts-3.4/cherryd cherryd3.4
+}
+
+python3.4-CherryPy_package() {
+	noarch=yes
+	depends="python3.4"
+	pycompile_version="3.4"
+	pycompile_module="cherrypy"
+	short_desc="${short_desc/Python2/Python3.4}"
+	pkg_install() {
+		vmove usr/bin/cherryd3.4
+		vmove usr/lib/python3.4
+		vlicense cherrypy/LICENSE.txt
+	}
 }
diff --git a/srcpkgs/python3.4-CherryPy b/srcpkgs/python3.4-CherryPy
new file mode 120000
index 00000000000..1a003f89e43
--- /dev/null
+++ b/srcpkgs/python3.4-CherryPy
@@ -0,0 +1 @@
+python-CherryPy
\ No newline at end of file