diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 86e212bb11d69..fbe77c7756fd8 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 6cf19d89c3c7c..4f459162a7e27 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 `__ and the `section on creating your own
-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 `__ and the `section on creating your own
+components `__.
If you run into issues while using Home Assistant or during development
of a component, check the `Home Assistant help section `__ of our website for further help and information.
diff --git a/docs/source/index.rst b/docs/source/index.rst
index a6157dc7aac47..c592f66c070c0 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 e9db666c03293..6f4c4d47fe956 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 ec024bef614b4..d1d29affeff44 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -115,8 +115,8 @@
'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__),