diff --git a/source/_includes/asides/hassio_navigation.html b/source/_includes/asides/hassio_navigation.html
index 0b7d9e04d81..e16b8df142c 100644
--- a/source/_includes/asides/hassio_navigation.html
+++ b/source/_includes/asides/hassio_navigation.html
@@ -8,6 +8,7 @@
           <li>{% active_link /hassio/installation/ Installation %}</li>
           <li>{% active_link /hassio/debugging/ Debugging %}</li>
           <li>{% active_link /addons/ Available add-ons %}</li>
+          <li>{% active_link /hassio/installing_third_party_addons/ Installing third-party add-ons %}</li>
           <li>{% active_link /hassio/architecture/ Architecture %}</li>
         </ul>
       </li>
diff --git a/source/hassio/addon_tutorial.markdown b/source/hassio/addon_tutorial.markdown
index d321065c79d..e026e24e756 100644
--- a/source/hassio/addon_tutorial.markdown
+++ b/source/hassio/addon_tutorial.markdown
@@ -78,7 +78,7 @@ Now comes the fun part, time to open the Hass.io UI and install and run your add
  - On the top right click the shopping basket to go to the add-on store.
 
 <p class='img'>
-<img src='/images/hassio/tutorial/main_panel_store_icon.png' />
+<img src='/images/hassio/screenshots/main_panel_store_icon.png' />
 From the Hass.io main panel open the add-on store.
 </p>
 
@@ -86,7 +86,7 @@ From the Hass.io main panel open the add-on store.
  - You should now see a new card called "Local" that lists your add-on!
 
 <p class='img'>
-<img src='/images/hassio/tutorial/local_repository.png' />
+<img src='/images/hassio/screenshots/local_repository.png' />
 The Hass.io add-on store will list all available local add-ons.
 </p>
 
diff --git a/source/hassio/installing_third_party_addons.markdown b/source/hassio/installing_third_party_addons.markdown
new file mode 100644
index 00000000000..8db74287763
--- /dev/null
+++ b/source/hassio/installing_third_party_addons.markdown
@@ -0,0 +1,30 @@
+---
+layout: page
+title: "Installing third-party add-ons"
+description: "Instructions how to get started using third-party add-ons."
+date: 2017-05-14 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+Hass.io allows anyone to create add-on repositories to easily share their add-ons for Hass.io. To try this locally, you can use our example add-on repository at `https://github.com/home-assistant/hassio-addons-example`.
+
+<p class='note warning'>
+Home Assistant cannot guarantee the quality or security of third party add-ons. Use at your own risk.
+</p>
+
+<p class='img'>
+<img src='/images/hassio/screenshots/main_panel_store_icon.png' />
+From the Hass.io main panel open the add-on store.
+</p>
+
+<p class='img'>
+<img src='/images/hassio/screenshots/repositories_editor.png' />
+Add the urls of repositories (one per line) and then press "Save". A new card for the repository will appear.
+</p>
+
+### {% linkable_title Help: Repository is not showing up %}
+
+If you have added a repository but it's not showing up, it means that the repository contains invalid configuration. Go to the Hass.io panel -> Supervisor card -> View logs and scroll to the bottom. It should tell you what went wrong. Report this information to the repository author.
diff --git a/source/images/hassio/screenshots/addon_repository_editor.png b/source/images/hassio/screenshots/addon_repository_editor.png
new file mode 100644
index 00000000000..e0e2b212886
Binary files /dev/null and b/source/images/hassio/screenshots/addon_repository_editor.png differ
diff --git a/source/images/hassio/tutorial/local_repository.png b/source/images/hassio/screenshots/local_repository.png
similarity index 100%
rename from source/images/hassio/tutorial/local_repository.png
rename to source/images/hassio/screenshots/local_repository.png
diff --git a/source/images/hassio/tutorial/main_panel_store_icon.png b/source/images/hassio/screenshots/main_panel_store_icon.png
similarity index 100%
rename from source/images/hassio/tutorial/main_panel_store_icon.png
rename to source/images/hassio/screenshots/main_panel_store_icon.png
diff --git a/source/images/hassio/screenshots/repositories_editor.png b/source/images/hassio/screenshots/repositories_editor.png
new file mode 100644
index 00000000000..a02427d1659
Binary files /dev/null and b/source/images/hassio/screenshots/repositories_editor.png differ