diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 86e212bb11d696f4482e5cfc8602d9c88e78885a..fbe77c7756fd89ffa25d5b9d60057815ec730d32 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,5 +10,5 @@ The process is straight-forward.
  - Ensure tests work.
  - Create a Pull Request against the [**dev**](https://github.com/home-assistant/home-assistant/tree/dev) branch of Home Assistant.
 
-Still interested? Then you should take a peek at the [developer documentation](https://home-assistant.io/developers/) to get more details.
+Still interested? Then you should take a peek at the [developer documentation](https://developers.home-assistant.io/) to get more details.
 
diff --git a/README.rst b/README.rst
index 6cf19d89c3c7c97398bff7e9f0b62b9f30e64a57..4f459162a7e2710176e6eb508933ffad3b3297e7 100644
--- a/README.rst
+++ b/README.rst
@@ -21,8 +21,8 @@ Featured integrations
 
 |screenshot-components|
 
-The system is built using a modular approach so support for other devices or actions can be implemented easily. See also the `section on architecture <https://home-assistant.io/developers/architecture/>`__ and the `section on creating your own
-components <https://home-assistant.io/developers/creating_components/>`__.
+The system is built using a modular approach so support for other devices or actions can be implemented easily. See also the `section on architecture <https://developers.home-assistant.io/docs/en/architecture_index.html>`__ and the `section on creating your own
+components <https://developers.home-assistant.io/docs/en/creating_component_index.html>`__.
 
 If you run into issues while using Home Assistant or during development
 of a component, check the `Home Assistant help section <https://home-assistant.io/help/>`__ of our website for further help and information.
diff --git a/docs/source/index.rst b/docs/source/index.rst
index a6157dc7aac478d42c507d7c6bb7c76188fa1936..c592f66c070c0e00b458e1a0fb9a6aeb51bdc69f 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -19,4 +19,4 @@ Indices and tables
 * :ref:`modindex`
 * :ref:`search`
 
-.. _Home Assistant developers: https://home-assistant.io/developers/
+.. _Home Assistant developers: https://developers.home-assistant.io/
diff --git a/homeassistant/components/websocket_api.py b/homeassistant/components/websocket_api.py
index e9db666c0329326d3148fe516553282684ccf62f..6f4c4d47fe9560bb7435b05d16aa1582acb1409c 100644
--- a/homeassistant/components/websocket_api.py
+++ b/homeassistant/components/websocket_api.py
@@ -2,7 +2,7 @@
 Websocket based API for Home Assistant.
 
 For more details about this component, please refer to the documentation at
-https://home-assistant.io/developers/websocket_api/
+https://developers.home-assistant.io/docs/external_api_websocket.html
 """
 import asyncio
 from concurrent import futures
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index ec024bef614b412ca05b2539bfac80d2edba72f2..d1d29affeff44cebc7575f73d7a6a42298367a62 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -115,8 +115,8 @@ IGNORE_REQ = (
     'colorama<=1',  # Windows only requirement in check_config
 )
 
-URL_PIN = ('https://home-assistant.io/developers/code_review_platform/'
-           '#1-requirements')
+URL_PIN = ('https://developers.home-assistant.io/docs/'
+           'creating_platform_code_review.html#1-requirements')
 
 
 CONSTRAINT_PATH = os.path.join(os.path.dirname(__file__),