diff --git a/README.dev.md b/README.dev.md
index 9667abd829..10564c6a75 100644
--- a/README.dev.md
+++ b/README.dev.md
@@ -476,8 +476,8 @@ restart if it crashes, and `upgrade-zulip` will take care of running
 migrations and then cleanly restaring the server for you).
 
 [django-runserver]: https://docs.djangoproject.com/en/1.8/ref/django-admin/#runserver-port-or-address-port
-[new-feature-tutorial]: http://zulip.readthedocs.org/en/latest/new-feature-tutorial.html
-[testing-docs]: http://zulip.readthedocs.org/en/latest/testing.html
+[new-feature-tutorial]: http://zulip.readthedocs.io/en/latest/new-feature-tutorial.html
+[testing-docs]: http://zulip.readthedocs.io/en/latest/testing.html
 
 Running the test suite
 ======================
@@ -485,7 +485,7 @@ Running the test suite
 For more details, especially on how to write tests, check out the
 [detailed testing docs][tdocs].
 
-[tdocs]: http://zulip.readthedocs.org/en/latest/testing.html
+[tdocs]: http://zulip.readthedocs.io/en/latest/testing.html
 
 To run all the tests, do this:
 ```
diff --git a/README.md b/README.md
index 600f5dc424..4f8d6d707f 100644
--- a/README.md
+++ b/README.md
@@ -70,10 +70,10 @@ repositories.
 contributing!
 
 [cla]: https://opensource.dropbox.com/cla/
-[doc]: https://zulip.readthedocs.org/
-[doc-commit-style]: http://zulip.readthedocs.org/en/latest/code-style.html#commit-messages
-[doc-dirstruct]: http://zulip.readthedocs.org/en/latest/directory-structure.html
-[doc-newfeat]: http://zulip.readthedocs.org/en/latest/new-feature-tutorial.html
+[doc]: https://zulip.readthedocs.io/
+[doc-commit-style]: http://zulip.readthedocs.io/en/latest/code-style.html#commit-messages
+[doc-dirstruct]: http://zulip.readthedocs.io/en/latest/directory-structure.html
+[doc-newfeat]: http://zulip.readthedocs.io/en/latest/new-feature-tutorial.html
 [doc-test]: https://github.com/zulip/zulip/blob/master/README.dev.md#running-the-test-suite
 [gg-devel]: https://groups.google.com/forum/#!forum/zulip-devel
 [gh-issues]: https://github.com/zulip/zulip/issues
diff --git a/README.prod.md b/README.prod.md
index 2fab40dc22..1a67b565d4 100644
--- a/README.prod.md
+++ b/README.prod.md
@@ -59,7 +59,7 @@ These instructions should be followed as root.
   installation process.  You can get a free properly signed
   certificate from the new [Letsencrypt](https://letsencrypt.org/)
   service, by following their [nginx
-  instructions](https://letsencrypt.readthedocs.org/en/latest/using.html#nginx).
+  instructions](https://letsencrypt.readthedocs.io/en/latest/using.html#nginx).
 
   When you do get an actual certificate, you will need to install as
   /etc/ssl/certs/zulip.combined-chain.crt the full certificate
diff --git a/docs/mypy.md b/docs/mypy.md
index 635059bb42..2989fec2c0 100644
--- a/docs/mypy.md
+++ b/docs/mypy.md
@@ -18,7 +18,7 @@ def get_user_profile_by_email(email):
 You can learn more about it at:
 
 * [Python 2 type annotation syntax in PEP 484](https://www.python.org/dev/peps/pep-0484/#suggested-syntax-for-python-2-7-and-straddling-code)
-* [Using mypy with Python 2 code](http://mypy.readthedocs.org/en/latest/python2.html)
+* [Using mypy with Python 2 code](http://mypy.readthedocs.io/en/latest/python2.html)
 
 The mypy type checker is run automatically as part of Zulip's Travis
 CI testing process.
diff --git a/templates/zerver/integrations.html b/templates/zerver/integrations.html
index 2ec5f2177f..e9b5935acf 100644
--- a/templates/zerver/integrations.html
+++ b/templates/zerver/integrations.html
@@ -31,7 +31,7 @@
     sure to note its username and API key.</p>
 
     <p>If an integration you want isn't available yet, you
-    can <a href="http://zulip.readthedocs.org/en/latest/integration-guide.html">contribute
+    can <a href="http://zulip.readthedocs.io/en/latest/integration-guide.html">contribute
     an integration</a>
     or <a href="https://github.com/zulip/zulip/issues/new">open an
     issue on GitHub</a> and tag it with the "integrations" label (so
diff --git a/zerver/lib/queue.py b/zerver/lib/queue.py
index 988256abab..3b703ffcd4 100644
--- a/zerver/lib/queue.py
+++ b/zerver/lib/queue.py
@@ -154,7 +154,7 @@ calling _adapter_disconnect, ignoring" % (e,))
 
 class TornadoQueueClient(SimpleQueueClient):
     # Based on:
-    # https://pika.readthedocs.org/en/0.9.8/examples/asynchronous_consumer_example.html
+    # https://pika.readthedocs.io/en/0.9.8/examples/asynchronous_consumer_example.html
     def __init__(self):
         super(TornadoQueueClient, self).__init__()
         self._on_open_cbs = [] # type: List[Callable[[], None]]