diff -Nru python-pip-20.0.2/debian/changelog python-pip-20.0.2/debian/changelog
--- python-pip-20.0.2/debian/changelog	2021-02-27 02:38:56.000000000 +0000
+++ python-pip-20.0.2/debian/changelog	2021-05-09 16:50:53.000000000 +0000
@@ -1,3 +1,10 @@
+python-pip (20.0.2-5ubuntu1.4) focal; urgency=medium
+
+  * Look for pip config /etc (LP: #1914239)
+  * Provide the pip binary again (LP: #1927865)
+
+ -- Stefano Rivera <stefanor@ubuntu.com>  Sun, 09 May 2021 12:50:53 -0400
+
 python-pip (20.0.2-5ubuntu1.3) focal; urgency=medium
 
   * Add Breaks: python3-virtualenv (<< 20.0.17-1ubuntu0.3) to python-pip-whl,
diff -Nru python-pip-20.0.2/debian/control python-pip-20.0.2/debian/control
--- python-pip-20.0.2/debian/control	2021-02-27 02:38:56.000000000 +0000
+++ python-pip-20.0.2/debian/control	2021-05-09 16:50:53.000000000 +0000
@@ -61,6 +61,9 @@
          ${python3:Depends},
 Recommends: build-essential,
             python3-dev (>= 3.2),
+Breaks: python-pip
+Replaces: python-pip
+Provides: pip
 Description: Python package installer
  pip is the Python package installer.  It integrates with virtualenv, doesn't
  do partial installs, can save package state for replaying, can install from
diff -Nru python-pip-20.0.2/debian/patches/config-in-etc.patch python-pip-20.0.2/debian/patches/config-in-etc.patch
--- python-pip-20.0.2/debian/patches/config-in-etc.patch	1970-01-01 00:00:00.000000000 +0000
+++ python-pip-20.0.2/debian/patches/config-in-etc.patch	2021-05-09 16:50:53.000000000 +0000
@@ -0,0 +1,46 @@
+From: Stefano Rivera <stefanor@debian.org>
+Date: Thu, 29 Apr 2021 19:27:18 -0400
+Subject: Look for pip config in /etc
+
+Previously this was done with a patch to the vendored appdirs module.
+Debian de-vendors pip, removing this.
+
+Origin: upstream, https://github.com/pypa/pip/pull/7786
+Bug-Upstream: https://github.com/pypa/pip/pull/7786
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-pip/+bug/1914239
+---
+ src/pip/_internal/utils/appdirs.py | 5 ++++-
+ src/pip/_vendor/appdirs.py         | 2 --
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/pip/_internal/utils/appdirs.py b/src/pip/_internal/utils/appdirs.py
+index 251c5fd..93d17b5 100644
+--- a/src/pip/_internal/utils/appdirs.py
++++ b/src/pip/_internal/utils/appdirs.py
+@@ -33,9 +33,12 @@ def user_data_dir(appname, roaming=False):
+     return _appdirs.user_data_dir(appname, appauthor=False, roaming=roaming)
+ 
+ 
++# for the discussion regarding site_config_dir locations
++# see <https://github.com/pypa/pip/issues/1733>
+ def site_config_dirs(appname):
+     # type: (str) -> List[str]
+     dirval = _appdirs.site_config_dir(appname, appauthor=False, multipath=True)
+     if _appdirs.system not in ["win32", "darwin"]:
+-        return dirval.split(os.pathsep)
++        # always look in /etc directly as well
++        return dirval.split(os.pathsep) + ['/etc']
+     return [dirval]
+diff --git a/src/pip/_vendor/appdirs.py b/src/pip/_vendor/appdirs.py
+index 3a52b75..cf37f98 100644
+--- a/src/pip/_vendor/appdirs.py
++++ b/src/pip/_vendor/appdirs.py
+@@ -257,8 +257,6 @@ def site_config_dir(appname=None, appauthor=None, version=None, multipath=False)
+             if version:
+                 appname = os.path.join(appname, version)
+             pathlist = [os.path.join(x, appname) for x in pathlist]
+-        # always look in /etc directly as well
+-        pathlist.append('/etc')
+ 
+         if multipath:
+             path = os.pathsep.join(pathlist)
diff -Nru python-pip-20.0.2/debian/patches/series python-pip-20.0.2/debian/patches/series
--- python-pip-20.0.2/debian/patches/series	2021-02-27 02:38:56.000000000 +0000
+++ python-pip-20.0.2/debian/patches/series	2021-05-09 16:50:53.000000000 +0000
@@ -7,3 +7,4 @@
 commands_list_version_workaround.patch
 add_pkg-resources_to_freeze.patch
 toml.patch
+config-in-etc.patch
diff -Nru python-pip-20.0.2/debian/python3-pip.links python-pip-20.0.2/debian/python3-pip.links
--- python-pip-20.0.2/debian/python3-pip.links	1970-01-01 00:00:00.000000000 +0000
+++ python-pip-20.0.2/debian/python3-pip.links	2021-05-09 16:50:53.000000000 +0000
@@ -0,0 +1 @@
+usr/share/man/man1/pip3.1.gz usr/share/man/man1/pip.1.gz
diff -Nru python-pip-20.0.2/debian/rules python-pip-20.0.2/debian/rules
--- python-pip-20.0.2/debian/rules	2021-02-27 02:38:56.000000000 +0000
+++ python-pip-20.0.2/debian/rules	2021-05-09 16:50:53.000000000 +0000
@@ -27,7 +27,6 @@
 
 override_dh_python3:
 	dh_python3 -v
-	rm -f debian/python3-pip/usr/bin/pip
 	rm -f debian/python3-pip/usr/bin/pip3.?
 	rm -rf debian/python3-pip/usr/lib/python3.?