diff --git a/Manual.md b/Manual.md
index c15a6566f7..929c8284b6 100644
--- a/Manual.md
+++ b/Manual.md
@@ -396,7 +396,7 @@ Example:
   | KERNEL_SITE      | http://www.kernel.org/pub/linux                 |
   | MOZILLA_SITE     | http://ftp.mozilla.org/pub                      |
   | NONGNU_SITE      | http://download.savannah.nongnu.org/releases    |
-  | PYPI_SITE        | https://pypi.io/packages/source                 |
+  | PYPI_SITE        | https://files.pythonhosted.org/packages/source  |
   | SOURCEFORGE_SITE | http://downloads.sourceforge.net/sourceforge    |
   | UBUNTU_SITE      | http://archive.ubuntu.com/ubuntu/pool           |
   | XORG_HOME        | http://xorg.freedesktop.org/wiki/               |
diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index b90049ee62..46c6b38b3e 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -13,7 +13,7 @@ GNOME_SITE="http://ftp.gnome.org/pub/GNOME/sources"
 KERNEL_SITE="http://www.kernel.org/pub/linux"
 #KERNEL_SITE="http://mirror.be.gbxs.net/pub/linux"
 CPAN_SITE="http://cpan.perl.org/modules/by-module"
-PYPI_SITE="https://pypi.io/packages/source"
+PYPI_SITE="https://files.pythonhosted.org/packages/source"
 MOZILLA_SITE="http://ftp.mozilla.org/pub"
 GNU_SITE="http://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="http://freedesktop.org/software"
diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 373dbfc51c..9d0e26a773 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -41,7 +41,7 @@ update_check() {
                 url="https://launchpad.net/$lpname/+download";;
             *cpan.*)
                 pkgname=${pkgname#perl-};;
-            *pypi.io*)
+            *pythonhosted.org*)
                 pkgname=${pkgname#python-}
                 url="https://pypi.io/simple/$pkgname";;
             *github.com*)