diff --git a/lang/python-pip/Makefile b/lang/python-pip/Makefile
index d7404ba2c..d0607d16e 100644
--- a/lang/python-pip/Makefile
+++ b/lang/python-pip/Makefile
@@ -40,8 +40,30 @@ define Build/Compile
 	)
 endef
 
+PYTHON_PIP_PKG_DIR:=$(PYTHON_PKG_DIR)/pip-$(PKG_VERSION)-py$(PYTHON_VERSION).egg/pip
 define PyPackage/python-pip/filespec
-+|/usr/lib/python$(PYTHON_VERSION)
++|$(PYTHON_PKG_DIR)
+-|$(PYTHON_PIP_PKG_DIR)/_vendor/distlib/*.exe
+endef
+
+# Backup these files, so that they do not clash with python-setuptools
+# If we install python-pip python-setuptools, we want these to be replaced,
+# since python-pip replaces python-setuptools (when installed)
+define Package/python-pip/preinst
+#!/bin/sh
+cd "$${IPKG_INSTROOT}$(PYTHON_PKG_DIR)"
+mv -f easy-install.pth easy-install.pth.old
+mv -f site.py site.py.old
+exit 0
+endef
+
+# And put them back on remove
+define Package/python-pip/postrm
+#!/bin/sh
+cd "$${IPKG_INSTROOT}$(PYTHON_PKG_DIR)"
+mv -f easy-install.pth.old easy-install.pth
+mv -f site.py.old site.py
+exit 0
 endef
 
 define PyPackage/python-pip/install