diff --git a/README.rst b/README.rst
index 8e122b753..5156285a3 100644
--- a/README.rst
+++ b/README.rst
@@ -11,11 +11,11 @@ Oslo Messaging Library
 ======================
 
 .. image:: https://img.shields.io/pypi/v/oslo.messaging.svg
-    :target: https://pypi.python.org/pypi/oslo.messaging/
+    :target: https://pypi.org/project/oslo.messaging/
     :alt: Latest Version
 
 .. image:: https://img.shields.io/pypi/dm/oslo.messaging.svg
-    :target: https://pypi.python.org/pypi/oslo.messaging/
+    :target: https://pypi.org/project/oslo.messaging/
     :alt: Downloads
 
 The Oslo messaging API supports RPC and notifications over a number of
diff --git a/doc/source/admin/AMQP1.0.rst b/doc/source/admin/AMQP1.0.rst
index fbe690764..9ef3adf39 100644
--- a/doc/source/admin/AMQP1.0.rst
+++ b/doc/source/admin/AMQP1.0.rst
@@ -219,12 +219,12 @@ library, Proton header files, and Pyngus must be installed.
 
 Source packages for the `Pyngus client API`_ are available via PyPI.
 
-.. _Pyngus client API: https://pypi.python.org/pypi/pyngus
+.. _Pyngus client API: https://pypi.org/project/pyngus
 
 Pyngus depends on the Proton Python bindings.  Source packages for the
 `Proton Python bindings`_ are also available via PyPI.
 
-.. _Proton Python bindings: https://pypi.python.org/pypi/python-qpid-proton
+.. _Proton Python bindings: https://pypi.org/project/python-qpid-proton
 
 Since the AMQP 1.0 driver is an optional extension to Oslo.Messaging
 these packages are not installed by default.  Use the 'amqp1' extras
@@ -641,8 +641,8 @@ PyPi
 
 Packages for `Pyngus pypi`_ and the `Proton pypi`_ engine are available on Pypi.
 
-.. _Pyngus pypi: https://pypi.python.org/pypi/pyngus
-.. _Proton pypi: https://pypi.python.org/pypi/python-qpid-proton
+.. _Pyngus pypi: https://pypi.org/project/pyngus
+.. _Proton pypi: https://pypi.org/project/python-qpid-proton
 
 
 RHEL and Fedora