diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
index 2f92969e8a3..2174be4b56f 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python-pip/template
@@ -1,25 +1,24 @@
 # Template file for 'python-pip'
 pkgname=python-pip
-version=6.0.6
+version=6.0.7
 revision=1
 noarch=yes
 wrksrc="pip-${version}"
 build_style=python-module
 python_versions="2.7 3.4"
 hostmakedepends="python-setuptools python3.4-setuptools"
-depends="python"
+depends="python-setuptools"
 pycompile_module="pip"
 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="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=3a14091299dcdb9bab9e9004ae67ac401f2b1b14a7c98de074ca74fdddf4bfa0
+checksum=35a5a43ac6b7af83ed47ea5731a365f43d350a3a7267e039e5f06b61d42ab3c2
 
-pre_install() {
-	sed -i 's,#!/usr/bin/env python,&3.4,' build-3.4/lib/pip/__init__.py
+pre_build() {
+	sed -i '1d' pip/__init__.py
 }
-
 post_install() {
 	rm -f ${DESTDIR}/usr/bin/pip
 	ln -sf pip2.7 ${DESTDIR}/usr/bin/pip
@@ -28,7 +27,7 @@ post_install() {
 
 python3.4-pip_package() {
 	noarch=yes
-	depends="python3.4"
+	depends="python3.4-setuptools"
 	pycompile_version="3.4"
 	pycompile_module="pip"
 	short_desc="${short_desc/Python2/Python3.4}"
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python-pip/update
new file mode 100644
index 00000000000..e90e593cd0a
--- /dev/null
+++ b/srcpkgs/python-pip/update
@@ -0,0 +1,2 @@
+site="https://pypi.python.org/pypi/pip"
+pattern="pip-\K[\d.]+(?=\.tar\.gz)"