diff --git a/README.rst b/README.rst
index ee3859aa5..b6158addc 100644
--- a/README.rst
+++ b/README.rst
@@ -160,7 +160,7 @@ Links
 
 * `Main website <https://borgbackup.readthedocs.io/>`_
 * `Releases <https://github.com/borgbackup/borg/releases>`_,
-  `PyPI packages <https://pypi.python.org/pypi/borgbackup>`_ and
+  `PyPI packages <https://pypi.org/project/borgbackup/>`_ and
   `Changelog <https://github.com/borgbackup/borg/blob/master/docs/changes.rst>`_
 * `Offline documentation <https://readthedocs.org/projects/borgbackup/downloads>`_
 * `GitHub <https://github.com/borgbackup/borg>`_ and
diff --git a/docs/conf.py b/docs/conf.py
index 218d8dd2d..12e9230f8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -250,5 +250,5 @@ extensions = [
 
 extlinks = {
     "issue": ("https://github.com/borgbackup/borg/issues/%s", "#%s"),
-    "targz_url": ("https://pypi.python.org/packages/source/b/borgbackup/%%s-%s.tar.gz" % version, None),
+    "targz_url": ("https://pypi.org/project/borgbackup/%s/#files", None),
 }
diff --git a/docs/global.rst.inc b/docs/global.rst.inc
index c961eb5bb..1568458d6 100644
--- a/docs/global.rst.inc
+++ b/docs/global.rst.inc
@@ -1,7 +1,7 @@
 .. highlight:: bash
 .. |package_dirname| replace:: borgbackup-|version|
 .. |package_filename| replace:: |package_dirname|.tar.gz
-.. |package_url| replace:: https://pypi.python.org/packages/source/b/borgbackup/|package_filename|
+.. |package_url| replace:: https://pypi.org/project/borgbackup/#files
 .. |git_url| replace:: https://github.com/borgbackup/borg.git
 .. _github: https://github.com/borgbackup/borg
 .. _issue tracker: https://github.com/borgbackup/borg/issues
@@ -21,11 +21,11 @@
 .. _`Python 3`: https://www.python.org/
 .. _Buzhash: https://en.wikipedia.org/wiki/Buzhash
 .. _msgpack: https://msgpack.org/
-.. _`msgpack-python`: https://pypi.python.org/pypi/msgpack-python/
-.. _llfuse: https://pypi.python.org/pypi/llfuse/
-.. _mfusepy: https://pypi.python.org/pypi/mfusepy/
-.. _pyfuse3: https://pypi.python.org/pypi/pyfuse3/
+.. _`msgpack-python`: https://pypi.org/project/msgpack-python/
+.. _llfuse: https://pypi.org/project/llfuse/
+.. _mfusepy: https://pypi.org/project/mfusepy/
+.. _pyfuse3: https://pypi.org/project/pyfuse3/
 .. _userspace filesystems: https://en.wikipedia.org/wiki/Filesystem_in_Userspace
 .. _Cython: http://cython.org/
-.. _virtualenv: https://pypi.python.org/pypi/virtualenv/
+.. _virtualenv: https://pypi.org/project/virtualenv/
 .. _mailing list discussion about internals: http://librelist.com/browser/attic/2014/5/6/questions-and-suggestions-about-inner-working-of-attic>