diff --git a/README.rst b/README.rst
index 8ca3639..1c2b1c9 100644
--- a/README.rst
+++ b/README.rst
@@ -3,11 +3,11 @@ osc-lib
 =======
 
 .. image:: https://img.shields.io/pypi/v/osc-lib.svg
-    :target: https://pypi.python.org/pypi/osc-lib/
+    :target: https://pypi.org/project/osc-lib/
     :alt: Latest Version
 
 .. image:: https://img.shields.io/pypi/dm/osc-lib.svg
-    :target: https://pypi.python.org/pypi/osc-lib/
+    :target: https://pypi.org/project/osc-lib/
     :alt: Downloads
 
 OpenStackClient (aka OSC) is a command-line client for OpenStack. osc-lib
@@ -24,7 +24,7 @@ is a package of common support modules for writing OSC plugins.
 * IRC: #openstack-sdks on Freenode (irc.freenode.net)
 * License: Apache 2.0
 
-.. _PyPi: https://pypi.python.org/pypi/osc-lib
+.. _PyPi: https://pypi.org/project/osc-lib
 .. _Online Documentation: http://docs.openstack.org/osc-lib/latest/
 .. _Launchpad project: https://launchpad.net/python-openstackclient
 .. _Bugs: https://bugs.launchpad.net/python-openstackclient
diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst
index c500cec..68f7aa3 100644
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -14,6 +14,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/osc-lib
+.. _PyPi: https://pypi.org/project/osc-lib
 .. _tarball: http://tarballs.openstack.org/osc-lib
 .. _IRC channel: https://wiki.openstack.org/wiki/IRC