diff --git a/README.rst b/README.rst
index 24c9fc556..a420f431f 100644
--- a/README.rst
+++ b/README.rst
@@ -158,6 +158,6 @@ Links
 * `Issue Tracker <https://storyboard.openstack.org/#!/project/760>`_
 * `Code Review <https://review.openstack.org/#/q/status:open+project:openstack/openstacksdk,n,z>`_
 * `Documentation <https://developer.openstack.org/sdks/python/openstacksdk/>`_
-* `PyPI <https://pypi.python.org/pypi/openstacksdk/>`_
+* `PyPI <https://pypi.org/project/openstacksdk/>`_
 * `Mailing list <http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev>`_
 * `Bugs <https://bugs.launchpad.net/python-openstacksdk>`_
diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
index 892994de5..e88e7e298 100644
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -8,7 +8,7 @@ Installation
 ------------
 
 The OpenStack SDK is available on
-`PyPI <https://pypi.python.org/pypi/openstacksdk>`_ under the name
+`PyPI <https://pypi.org/project/openstacksdk>`_ under the name
 **openstacksdk**. To install it, use ``pip``::
 
    $ pip install openstacksdk
diff --git a/doc/source/user/multi-cloud-demo.rst b/doc/source/user/multi-cloud-demo.rst
index 9fd8c6c91..de529d598 100644
--- a/doc/source/user/multi-cloud-demo.rst
+++ b/doc/source/user/multi-cloud-demo.rst
@@ -12,7 +12,7 @@ walk through it like a presentation, install `presentty` and run:
 The content is hopefully helpful even if it's not being narrated, so it's being
 included in the `shade` docs.
 
-.. _presentty: https://pypi.python.org/pypi/presentty
+.. _presentty: https://pypi.org/project/presentty
 
 Using Multiple OpenStack Clouds Easily with Shade
 =================================================
@@ -52,7 +52,7 @@ shade is Free Software
 This talk is Free Software, too
 ===============================
 
-* Written for presentty (https://pypi.python.org/pypi/presentty)
+* Written for presentty (https://pypi.org/project/presentty)
 * doc/source/multi-cloud-demo.rst
 * examples in doc/source/examples
 * Paths subject to change- this is the first presentation in tree!