diff --git a/README.rst b/README.rst
index ba52cb2d97a..7683386cd48 100644
--- a/README.rst
+++ b/README.rst
@@ -18,7 +18,7 @@ Async http client/server framework
     :target: https://badge.fury.io/py/aiohttp
 
 .. image:: https://readthedocs.org/projects/aiohttp/badge/?version=latest
-   :target: http://aiohttp.readthedocs.io/en/latest/
+   :target: http://docs.aiohttp.org/
    :alt: Latest Read The Docs
 
 .. image:: https://badges.gitter.im/Join%20Chat.svg
diff --git a/aiohttp/worker.py b/aiohttp/worker.py
index 2e87a0c6938..5c3f173f72b 100644
--- a/aiohttp/worker.py
+++ b/aiohttp/worker.py
@@ -227,7 +227,7 @@ def _get_valid_log_format(self, source_format):
                 "Gunicorn's style options in form of `%(name)s` are not "
                 "supported for the log formatting. Please use aiohttp's "
                 "format specification to configure access log formatting: "
-                "http://aiohttp.readthedocs.io/en/stable/logging.html"
+                "http://docs.aiohttp.org/en/stable/logging.html"
                 "#format-specification"
             )
         else:
diff --git a/docs/conf.py b/docs/conf.py
index f27810e46bb..e70b691a538 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -155,6 +155,7 @@
 html_theme_options = {
     'logo': 'aiohttp-icon-128x128.png',
     'description': 'http client/server for asyncio',
+    'canonical_url': 'http://docs.aiohttp.org/en/stable/',
     'github_user': 'aio-libs',
     'github_repo': 'aiohttp',
     'github_button': True,