diff --git a/srcpkgs/python-greenlet-devel b/srcpkgs/python-greenlet-devel
new file mode 120000
index 00000000000..02a0d85bae6
--- /dev/null
+++ b/srcpkgs/python-greenlet-devel
@@ -0,0 +1 @@
+python-greenlet
\ No newline at end of file
diff --git a/srcpkgs/python-greenlet/template b/srcpkgs/python-greenlet/template
index 2e916fcb88f..d8585767a4c 100644
--- a/srcpkgs/python-greenlet/template
+++ b/srcpkgs/python-greenlet/template
@@ -1,29 +1,44 @@
 # Template file for 'python-greenlet'
 pkgname=python-greenlet
 version=0.4.7
-revision=1
-build_style="python-module"
+revision=2
+wrksrc="greenlet-${version}"
+build_style=python-module
 python_versions="2.7 3.4"
 hostmakedepends="python-setuptools python3.4-setuptools unzip"
 makedepends="python-devel python3.4-devel"
+replaces="python-greenlet<0.4.7_1"
 short_desc="Lightweight in-process concurrent programming (Python2)"
+_short_desc="${short_desc/Python2/Python3.4}"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="MIT"
-homepage="http://pypi.python.org/pypi/greenlet"
+homepage="https://github.com/python-greenlet/greenlet"
 distfiles="${PYPI_SITE}/g/greenlet/greenlet-${version}.zip"
 checksum="f32c4fa4e06443e1bdb0d32b69e7617c25ff772c3ffc6d0aa63d192e9fd795fe"
-wrksrc="greenlet-${version}"
 
 post_install() {
 	vlicense LICENSE
 }
 
+python-greenlet-devel_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include/python2.7
+	}
+}
+python3.4-greenlet-devel_package() {
+	depends="python3.4-greenlet-${version}_${revision}"
+	short_desc="${_short_desc} - development files"
+	pkg_install() {
+		vmove usr/include/python3.4m
+	}
+}
 python3.4-greenlet_package() {
-	pycompile_version="3.4"
-	short_desc="${short_desc/Python2/Python3.4}"
+	replaces="python3.4-greenlet<0.4.7_1"
+	short_desc="${_short_desc}"
 	pkg_install() {
 		vmove usr/lib/python3.4
-		vmove usr/include/python3.4m
 		vlicense LICENSE
 	}
 }
diff --git a/srcpkgs/python3.4-greenlet-devel b/srcpkgs/python3.4-greenlet-devel
new file mode 120000
index 00000000000..02a0d85bae6
--- /dev/null
+++ b/srcpkgs/python3.4-greenlet-devel
@@ -0,0 +1 @@
+python-greenlet
\ No newline at end of file