diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
index 4a371995bfd..3f9932127e3 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python-pip/template
@@ -1,43 +1,41 @@
 # Template file for 'python-pip'
 pkgname=python-pip
-version=1.5.6
-revision=2
+version=6.0.3
+revision=1
+noarch=yes
 wrksrc="pip-${version}"
 build_style=python-module
-hostmakedepends="python python-setuptools python3.4 python3.4-setuptools"
-makedepends="python-devel python3.4-devel"
-depends="python>=2.7 python-setuptools"
-noarch="yes"
 python_versions="2.7 3.4"
+hostmakedepends="python-setuptools python3.4-setuptools"
+depends="python-setuptools"
 pycompile_module="pip"
-short_desc="An easy_install replacement for installing PyPI packages (Python2)"
+short_desc="The PyPA recommended tool for installing PyPI packages (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="https://pip.pypa.io/"
 license="MIT"
-distfiles="http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz"
-checksum=b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c
+distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
+checksum=b091a35f5fa0faffac0b27b97e1e1e93ffe63b463c2ea8dbde0c1fb987933614
 
 pre_install() {
-	sed -i 's|#!/usr/bin/env python$|#!/usr/bin/env python3.4|' \
-		build-3.4/lib/pip/__init__.py
+	sed -i 's,#!/usr/bin/env python,&3.4,' build-3.4/lib/pip/__init__.py
 }
 
 post_install() {
 	rm -f ${DESTDIR}/usr/bin/pip
 	ln -sf pip2.7 ${DESTDIR}/usr/bin/pip
-	vinstall LICENSE.txt 644 usr/share/licenses/${pkgname} LICENSE
+	vlicense LICENSE.txt
 }
 
 python3.4-pip_package() {
-	noarch="yes"
+	noarch=yes
 	pycompile_version="3.4"
 	pycompile_module="pip"
-	depends="python3.4 python3.4-setuptools"
+	depends="python3.4-setuptools"
 	short_desc="${short_desc//Python2/Python3.4}"
 	pkg_install() {
-		vmove /usr/bin/pip3
-		vmove /usr/bin/pip3.4
-		vmove /usr/lib/python3.4
-		vinstall ${wrksrc}/LICENSE.txt 644 usr/share/licenses/${pkgname} LICENSE
+		vmove usr/bin/pip3
+		vmove usr/bin/pip3.4
+		vmove usr/lib/python3.4
+		vlicense LICENSE.txt
 	}
 }