diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3826ab6..9d4d491 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -36,6 +36,7 @@ Other
 
 * Migrations have been squashed for Django 2.0 support. Be sur to apply all migration before
   updating to this version
+* Update PyPi url from https://pypi.python.org to https://pypi.org
 
 v0.9.0 - 2017-11-17
 ===================
diff --git a/README.rst b/README.rst
index 4d7570f..6106e7b 100644
--- a/README.rst
+++ b/README.rst
@@ -645,7 +645,7 @@ You could for example do as bellow::
     :target: https://travis-ci.org/nitmir/django-cas-server
 
 .. |pypi_version| image:: https://badges.genua.fr/pypi/v/django-cas-server.svg
-    :target: https://pypi.python.org/pypi/django-cas-server
+    :target: https://pypi.org/project/django-cas-server/
 
 .. |github_version| image:: https://badges.genua.fr/github/tag/nitmir/django-cas-server.svg?label=github
     :target: https://github.com/nitmir/django-cas-server/releases/latest
diff --git a/cas_server/default_settings.py b/cas_server/default_settings.py
index 33a0696..64d0140 100644
--- a/cas_server/default_settings.py
+++ b/cas_server/default_settings.py
@@ -193,7 +193,7 @@ CAS_NEW_VERSION_HTML_WARNING = True
 CAS_NEW_VERSION_EMAIL_WARNING = True
 #: URL to the pypi json of the application. Used to retreive the version number of the last version.
 #: You should not change it.
-CAS_NEW_VERSION_JSON_URL = "https://pypi.python.org/pypi/django-cas-server/json"
+CAS_NEW_VERSION_JSON_URL = "https://pypi.org/pypi/django-cas-server/json"
 
 #: If the service message should be displayed on the login page
 CAS_SHOW_SERVICE_MESSAGES = True
diff --git a/cas_server/models.py b/cas_server/models.py
index 0fa8834..657a669 100644
--- a/cas_server/models.py
+++ b/cas_server/models.py
@@ -1097,7 +1097,7 @@ Upgrade using:
     * pip install -U django-cas-server
     * fetching the last release on
       https://github.com/nitmir/django-cas-server/ or on
-      https://pypi.python.org/pypi/django-cas-server
+      https://pypi.org/project/django-cas-server/
 
 After upgrade, do not forget to run:
     * ./manage.py migrate
diff --git a/cas_server/templates/cas_server/base.html b/cas_server/templates/cas_server/base.html
index 8b16b5f..927df1f 100644
--- a/cas_server/templates/cas_server/base.html
+++ b/cas_server/templates/cas_server/base.html
@@ -71,7 +71,7 @@
       <div style="clear: both;"></div>
       {% if settings.CAS_SHOW_POWERED %}
       <div id="footer">
-          <p><a class="text-muted" href="https://pypi.python.org/pypi/django-cas-server">django-cas-server powered</a></p>
+          <p><a class="text-muted" href="https://pypi.org/project/django-cas-server/">django-cas-server powered</a></p>
       </div>
       {% endif %}
       <script src="{{settings.CAS_COMPONENT_URLS.jquery}}"></script>
@@ -94,6 +94,6 @@ discard_and_remember("#info-{{msg.name}}", "cas-info-{{msg.name}}", "{{msg.hash}
 <!--
 Powered by django-cas-server version {{VERSION}}
 
-Pypi: https://pypi.python.org/pypi/django-cas-server
+Pypi: https://pypi.org/project/django-cas-server/
 github: https://github.com/nitmir/django-cas-server
 -->
diff --git a/cas_server/tests/test_utils.py b/cas_server/tests/test_utils.py
index add692d..3064abf 100644
--- a/cas_server/tests/test_utils.py
+++ b/cas_server/tests/test_utils.py
@@ -226,7 +226,7 @@ class UtilsTestCase(TestCase):
         """
         try:
             # first check if pypi is available
-            utils.requests.get("https://pypi.python.org/simple/django-cas-server/")
+            utils.requests.get("https://pypi.org/simple/django-cas-server/")
         except utils.requests.exceptions.RequestException:
             warnings.warn(
                 (