diff --git a/cms/views.py b/cms/views.py
index 1b9c36a83..e3d938136 100644
--- a/cms/views.py
+++ b/cms/views.py
@@ -3,7 +3,7 @@
 from urllib.parse import urljoin
 
 LEGACY_PYTHON_DOMAIN = 'http://legacy.python.org'
-PYPI_URL = 'https://pypi.python.org/'
+PYPI_URL = 'https://pypi.org/'
 
 
 def legacy_path(path):
diff --git a/docs/source/administration.rst b/docs/source/administration.rst
index 25fdd39e6..6a7ee08bf 100644
--- a/docs/source/administration.rst
+++ b/docs/source/administration.rst
@@ -6,7 +6,7 @@ Administration
 Navigation
 ----------
 
-Navigation on the site is managed by the `Sitetree  <https://pypi.python.org/pypi/django-sitetree>`_ application.  The hierarchy should be fairly obvious.  The biggest gotcha is when defining the URLs.
+Navigation on the site is managed by the `Sitetree  <https://pypi.org/pypi/django-sitetree>`_ application.  The hierarchy should be fairly obvious.  The biggest gotcha is when defining the URLs.
 
 Many URLs are defined using `Django's URL system <https://docs.djangoproject.com/en/dev/topics/http/urls/>`_ however many are also simply defined as relative paths.  When editing a particular item in the Sitetree in the *Additional Settings* fieldset there is an option named *URL as pattern*.  If this option is checked the URL pattern is checked against the URLs defined by the Django applications. If it is left unchecked relative and absolute URLs can be entered.