diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
index 236e30a1538..984d9da89c8 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python-pip/template
@@ -1,12 +1,11 @@
 # Template file for 'python-pip'
 pkgname=python-pip
 version=8.1.2
-revision=1
+revision=2
 noarch=yes
 wrksrc="pip-${version}"
 build_style=python-module
-python_versions="2.7 3.4"
-hostmakedepends="python-setuptools python3.4-setuptools"
+hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
 pycompile_module="pip"
 short_desc="The PyPA recommended tool for installing PyPI packages (Python2)"
@@ -15,25 +14,28 @@ homepage="https://pip.pypa.io/"
 license="MIT"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
 checksum=4d24b03ffa67638a3fa931c09fd9e0273ffa904e95ebebe7d4b1a54c93d7b732
-alternatives="pip:pip:/usr/bin/pip2.7"
+alternatives="pip:pip:/usr/bin/pip2"
 
 post_install() {
-	ln -sf pip2.7 ${DESTDIR}/usr/bin/pip2
 	vlicense LICENSE.txt LICENSE
 }
 
-python3.4-pip_package() {
-	alternatives="
-	 pip:pip:/usr/bin/pip3.4
-	 pip3:pip3:/usr/bin/pip3.4"
+python3-pip_package() {
 	noarch=yes
-	depends="python3.4-setuptools"
-	pycompile_version="3.4"
 	pycompile_module="pip"
-	short_desc="${short_desc/Python2/Python3.4}"
+	replaces="python3.4-pip>=0"
+	depends="python3-setuptools"
+	short_desc="${short_desc/Python2/Python3}"
+	alternatives="pip:pip:/usr/bin/pip3"
 	pkg_install() {
-		vmove usr/bin/pip3.4
-		vmove usr/lib/python3.4
+		vmove usr/bin/pip3
+		vmove ${py3_sitelib}
 		vlicense LICENSE.txt LICENSE
 	}
 }
+python3.4-pip_package() {
+	noarch=yes
+	build_style=meta
+	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
+	depends="python3-pip>=${version}_${revision}"
+}
diff --git a/srcpkgs/python3-pip b/srcpkgs/python3-pip
new file mode 120000
index 00000000000..9de2412ef67
--- /dev/null
+++ b/srcpkgs/python3-pip
@@ -0,0 +1 @@
+python-pip
\ No newline at end of file