diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python-pip/patches/no-versioned-pip.patch
new file mode 100644
index 00000000000..1dfa00bf5ef
--- /dev/null
+++ b/srcpkgs/python-pip/patches/no-versioned-pip.patch
@@ -0,0 +1,11 @@
+--- setup.py.orig
++++ setup.py
+@@ -78,8 +78,6 @@ setup(
+     entry_points={
+         "console_scripts": [
+             "pip=pip:main",
+-            "pip%s=pip:main" % sys.version[:1],
+-            "pip%s=pip:main" % sys.version[:3],
+         ],
+     },
+     tests_require=tests_require,
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
index f447751f6fa..eb9d5be8b0e 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python-pip/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pip'
 pkgname=python-pip
 version=8.1.1
-revision=1
+revision=2
 noarch=yes
 wrksrc="pip-${version}"
 build_style=python-module
@@ -16,23 +16,24 @@ license="MIT"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
 checksum=3e78d3066aaeb633d185a57afdccf700aa2e660436b4af618bcb6ff0fa511798
 
-pre_build() {
-	sed -i '/^#!/d' pip/__init__.py
-}
+alternatives="
+ pip:pip:/usr/bin/pip2.7
+ pip:pip2:/usr/bin/pip2.7"
+
 post_install() {
-	rm -f ${DESTDIR}/usr/bin/pip
-	ln -sf pip2.7 ${DESTDIR}/usr/bin/pip
 	vlicense LICENSE.txt LICENSE
 }
 
 python3.4-pip_package() {
+	alternatives="
+	 pip:pip:/usr/bin/pip3.4
+	 pip:pip3:/usr/bin/pip3.4"
 	noarch=yes
 	depends="python3.4-setuptools"
 	pycompile_version="3.4"
 	pycompile_module="pip"
 	short_desc="${short_desc/Python2/Python3.4}"
 	pkg_install() {
-		vmove usr/bin/pip3
 		vmove usr/bin/pip3.4
 		vmove usr/lib/python3.4
 		vlicense LICENSE.txt LICENSE