diff --git a/README.rst b/README.rst
index 01153f3..a07dad0 100644
--- a/README.rst
+++ b/README.rst
@@ -3,11 +3,11 @@ OpenStackClient
 ===============
 
 .. image:: https://img.shields.io/pypi/v/openstackclient.svg
-    :target: https://pypi.python.org/pypi/openstackclient/
+    :target: https://pypi.org/project/openstackclient/
     :alt: Latest Version
 
 .. image:: https://img.shields.io/pypi/dm/openstackclient.svg
-    :target: https://pypi.python.org/pypi/openstackclient/
+    :target: https://pypi.org/project/openstackclient/
     :alt: Downloads
 
 OpenStackClient (aka OSC) is a command-line client for OpenStack that brings
@@ -29,7 +29,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/openstackclient
+.. _PyPi: https://pypi.org/project/openstackclient
 .. _Online Documentation: http://docs.openstack.org/developer/python-openstackclient/
 .. _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 3938fcc..f28a893 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -27,6 +27,6 @@ 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/openstackclient
+.. _PyPi: https://pypi.org/project/openstackclient
 .. _tarball: http://tarballs.openstack.org/openstackclient
 .. _IRC channel: https://wiki.openstack.org/wiki/IRC