diff --git a/README.rst b/README.rst
index 3b3642ed2..de216f1eb 100644
--- a/README.rst
+++ b/README.rst
@@ -12,11 +12,11 @@ OpenStackClient
 ===============
 
 .. image:: https://img.shields.io/pypi/v/python-openstackclient.svg
-    :target: https://pypi.python.org/pypi/python-openstackclient/
+    :target: https://pypi.org/project/python-openstackclient/
     :alt: Latest Version
 
 .. image:: https://img.shields.io/pypi/dm/python-openstackclient.svg
-    :target: https://pypi.python.org/pypi/python-openstackclient/
+    :target: https://pypi.org/project/python-openstackclient/
     :alt: Downloads
 
 OpenStackClient (aka OSC) is a command-line client for OpenStack that brings
@@ -38,7 +38,7 @@ language to describe operations in OpenStack.
 * IRC: #openstack-sdks on Freenode (irc.freenode.net)
 * License: Apache 2.0
 
-.. _PyPi: https://pypi.python.org/pypi/python-openstackclient
+.. _PyPi: https://pypi.org/project/python-openstackclient
 .. _Online Documentation: https://docs.openstack.org/python-openstackclient/latest/
 .. _Launchpad project: https://launchpad.net/python-openstackclient
 .. _Blueprints: https://blueprints.launchpad.net/python-openstackclient
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 3f63edb3b..37cc6c572 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -65,7 +65,7 @@ Developers may also be found in the `IRC channel`_ ``#openstack-sdks``.
 .. _Gerrit: http://docs.openstack.org/infra/manual/developers.html#development-workflow
 .. _Bug reports: https://bugs.launchpad.net/python-openstackclient/+bugs
 .. _blueprints: https://blueprints.launchpad.net/python-openstackclient
-.. _PyPi: https://pypi.python.org/pypi/python-openstackclient
+.. _PyPi: https://pypi.org/project/python-openstackclient
 .. _tarball: http://tarballs.openstack.org/python-openstackclient
 .. _IRC channel: https://wiki.openstack.org/wiki/IRC