diff --git a/general.ent b/general.ent
index 00eea04e1..ee5fd35db 100644
--- a/general.ent
+++ b/general.ent
@@ -118,6 +118,8 @@
 <!ENTITY savannah        "https://download.savannah.gnu.org">
 <!ENTITY savannah-nongnu "https://savannah.nongnu.org">
 <!ENTITY github          "https://github.com">
+<!ENTITY pypi-home       "https://pypi.org/project">
+<!ENTITY pypi-src        "https://pypi.org/packages/source">
 
 <!ENTITY root            "<systemitem class='username'>root</systemitem>">
 <!ENTITY lfs-user        "<systemitem class='username'>lfs</systemitem>">
diff --git a/packages.ent b/packages.ent
index 0992f5e4d..861bfd717 100644
--- a/packages.ent
+++ b/packages.ent
@@ -737,12 +737,11 @@
 <!ENTITY vim-fin-du "217 MB">
 <!ENTITY vim-fin-sbu "2.5 SBU">
 
-<!-- From https://files.pythonhosted.org/packages/c0/6c/9f840c2e55b67b90745af06a540964b73589256cb10cc10057c87ac78fc2/wheel-0.37.1.tar.gz -->
 <!ENTITY wheel-version "0.37.1">
 <!ENTITY wheel-size "65 KB">
-<!ENTITY wheel-url "&anduin-sources;/wheel-&wheel-version;.tar.gz">
+<!ENTITY wheel-url "&pypi-src;/w/wheel/wheel-&wheel-version;.tar.gz">
 <!ENTITY wheel-md5 "f490f1399e5903706cb1d4fbed9ecb28">
-<!ENTITY wheel-home "https://pypi.org/project/wheel/">
+<!ENTITY wheel-home "&pypi-home;/wheel/">
 <!ENTITY wheel-fin-du "956 KB">
 <!ENTITY wheel-fin-sbu "less than 0.1 SBU">