diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 70f8a5ae3..aeec693d7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -35,7 +35,7 @@ Changes:
 This is the first release under full stewardship of PyCA.
 We have made *many* changes to make local development more pleasing.
 The test suite now passes both on Linux and OS X with OpenSSL 0.9.8, 1.0.1, and 1.0.2.
-It has been moved to `py.test <https://pytest.org/>`_, all CI test runs are part of `tox <https://testrun.org/tox/>`_ and the source code has been made fully `flake8 <https://flake8.readthedocs.org/>`_ compliant.
+It has been moved to `py.test <https://pytest.org/>`_, all CI test runs are part of `tox <https://testrun.org/tox/>`_ and the source code has been made fully `flake8 <https://flake8.readthedocs.io/>`_ compliant.
 
 We hope to have lowered the barrier for contributions significantly but are open to hear about any remaining frustrations.
 
diff --git a/README.rst b/README.rst
index 3ba5fe196..6fe3df7c8 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@ pyOpenSSL -- A Python wrapper around the OpenSSL library
 ========================================================
 
 .. image:: https://readthedocs.org/projects/pyopenssl/badge/?version=stable
-   :target: https://pyopenssl.readthedocs.org/
+   :target: https://pyopenssl.readthedocs.io/
    :alt: Stable Docs
 
 .. image:: https://travis-ci.org/pyca/pyopenssl.svg?branch=master
@@ -37,7 +37,7 @@ We maintain a cryptography-dev_ mailing list for both user and development discu
 You can also join ``#cryptography-dev`` on Freenode to ask questions or get involved.
 
 
-.. _documentation: https://pyopenssl.readthedocs.org/
+.. _documentation: https://pyopenssl.readthedocs.io/
 .. _`issue tracker`: https://github.com/pyca/pyopenssl/issues
 .. _cryptography-dev: https://mail.python.org/mailman/listinfo/cryptography-dev
 .. _GitHub: https://github.com/pyca/pyopenssl
diff --git a/doc/ChangeLog_old.txt b/doc/ChangeLog_old.txt
index 88174d5ae..214a26d97 100644
--- a/doc/ChangeLog_old.txt
+++ b/doc/ChangeLog_old.txt
@@ -1,5 +1,5 @@
 This file only contains the changes up to release 0.15.1.  Newer changes can be
-found at <https://pyopenssl.readthedocs.org/en/latest/changelog.html>.
+found at <https://pyopenssl.readthedocs.io/en/latest/changelog.html>.
 
 ***
 
diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py
index 5d542d40c..7153694a2 100644
--- a/src/OpenSSL/version.py
+++ b/src/OpenSSL/version.py
@@ -14,7 +14,7 @@
 __version__ = "16.1.0.dev0"
 
 __title__ = "pyOpenSSL"
-__uri__ = "https://pyopenssl.readthedocs.org/"
+__uri__ = "https://pyopenssl.readthedocs.io/"
 __summary__ = "Python wrapper module around the OpenSSL library"
 __author__ = "The pyOpenSSL developers"
 __email__ = "cryptography-dev@python.org"