diff --git a/_config.yml b/_config.yml
index c3838026632..27f14114207 100644
--- a/_config.yml
+++ b/_config.yml
@@ -75,6 +75,8 @@ collections:
     output: true
   docs:
     output: true
+  addons:
+    output: true
 
 # ----------------------- #
 #   3rd Party Settings    #
diff --git a/source/_addons/lets_encrypt.markdown b/source/_addons/lets_encrypt.markdown
new file mode 100644
index 00000000000..cd75d7038b7
--- /dev/null
+++ b/source/_addons/lets_encrypt.markdown
@@ -0,0 +1,12 @@
+---
+layout: page
+title: "Let's Encrypt"
+description: "Automatically manage your SSL certificate using Let's Encrypt."
+date: 2017-04-30 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+[Placeholder]
\ No newline at end of file
diff --git a/source/_addons/mosquitto.markdown b/source/_addons/mosquitto.markdown
new file mode 100644
index 00000000000..95acc8c8727
--- /dev/null
+++ b/source/_addons/mosquitto.markdown
@@ -0,0 +1,12 @@
+---
+layout: page
+title: "Mosquitto MQTT broker"
+description: "Fast and reliable MQTT broker."
+date: 2017-04-30 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+[Placeholder]
\ No newline at end of file
diff --git a/source/_addons/samba.markdown b/source/_addons/samba.markdown
new file mode 100644
index 00000000000..285c11e2bb0
--- /dev/null
+++ b/source/_addons/samba.markdown
@@ -0,0 +1,12 @@
+---
+layout: page
+title: "Samba"
+description: "Manage your Home Assistant and custom addons over Samba."
+date: 2017-04-30 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+[Placeholder]
\ No newline at end of file
diff --git a/source/_addons/ssh.markdown b/source/_addons/ssh.markdown
new file mode 100644
index 00000000000..2aafa4f8175
--- /dev/null
+++ b/source/_addons/ssh.markdown
@@ -0,0 +1,12 @@
+---
+layout: page
+title: "SSH Server"
+description: "Allow logging in remotely to your server using SSH."
+date: 2017-04-30 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+[Placeholder]
\ No newline at end of file
diff --git a/source/_includes/asides/hassio_navigation.html b/source/_includes/asides/hassio_navigation.html
new file mode 100644
index 00000000000..764f3f9d36c
--- /dev/null
+++ b/source/_includes/asides/hassio_navigation.html
@@ -0,0 +1,17 @@
+<section class="aside-module grid__item one-whole lap-one-half">
+  <div class='section'>
+    <h1 class="title delta">Topics</h1>
+    <ul class='divided sidebar-menu'>
+      <li>
+        {% active_link /hassio/ Hass.io %}
+        <ul>
+          <li>{% active_link /hassio/installation/ Installation %}</li>
+          <li>{% active_link /hassio/architecture/ Architecture %}</li>
+          <li>{% active_link /addons/ Available add-ons %}</li>
+          <li>{% active_link /hassio/create_hassio_addon/ Creating add-ons %}</li>
+          <li>{% active_link /hassio/create_hassio_addon_repository/ Creating add-on repositories %}</li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+</section>
diff --git a/source/_includes/site/sidebar.html b/source/_includes/site/sidebar.html
index dcaf694b71e..9f0cf41e435 100644
--- a/source/_includes/site/sidebar.html
+++ b/source/_includes/site/sidebar.html
@@ -10,6 +10,8 @@
     {% include asides/getting_started_navigation.html | compact_newlines %}
   {% elsif url_parts[1] == 'docs' %}
     {% include asides/docs_navigation.html | compact_newlines %}
+  {% elsif url_parts[1] == 'hassio' or url_parts[1] == 'addons' %}
+    {% include asides/hassio_navigation.html | compact_newlines %}
   {% else %}
     {% include asides/about.html %}
 
diff --git a/source/addons/index.html b/source/addons/index.html
new file mode 100644
index 00000000000..4bb37dd3056
--- /dev/null
+++ b/source/addons/index.html
@@ -0,0 +1,21 @@
+---
+layout: page
+title: "Hass.io Add-ons"
+description: "List of the built-in add-ons of Hass.io."
+date: 2017-04-30 13:35
+sidebar: true
+comments: false
+sharing: true
+footer: true
+regenerate: true
+---
+
+[Placeholder]
+
+{% assign addons = site.addons | sort: 'title' %}
+
+<ul>
+{% for addon in addons %}
+  <li><a href='{{ addon.url }}'>{{ addon.title }}</a></li>
+{% endfor %}
+</ul>
diff --git a/source/hassio/architecture.markdown b/source/hassio/architecture.markdown
new file mode 100644
index 00000000000..c1335449e34
--- /dev/null
+++ b/source/hassio/architecture.markdown
@@ -0,0 +1,12 @@
+---
+layout: page
+title: "Hass.io Architecture"
+description: "The architecture of Hass.io."
+date: 2017-04-30 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+[Placeholder]
\ No newline at end of file
diff --git a/source/hassio/create_hassio_addon.markdown b/source/hassio/create_hassio_addon.markdown
new file mode 100644
index 00000000000..5924fe1a066
--- /dev/null
+++ b/source/hassio/create_hassio_addon.markdown
@@ -0,0 +1,12 @@
+---
+layout: page
+title: "Create an add-on for Hass.io"
+description: "Steps on how to create an add-on for Hass.io."
+date: 2017-04-30 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+[Placeholder]
\ No newline at end of file
diff --git a/source/hassio/create_hassio_addon_repository.markdown b/source/hassio/create_hassio_addon_repository.markdown
new file mode 100644
index 00000000000..62d347884ae
--- /dev/null
+++ b/source/hassio/create_hassio_addon_repository.markdown
@@ -0,0 +1,12 @@
+---
+layout: page
+title: "Create an add-on repository for Hass.io"
+description: "Add-ons repositories allow ."
+date: 2017-04-30 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+[Placeholder]
\ No newline at end of file
diff --git a/source/hassio/index.markdown b/source/hassio/index.markdown
new file mode 100644
index 00000000000..f1fced18769
--- /dev/null
+++ b/source/hassio/index.markdown
@@ -0,0 +1,12 @@
+---
+layout: page
+title: "Hass.io"
+description: "Manage your Home Assistant and custom addons over Samba."
+date: 2017-04-30 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+[Placeholder]
diff --git a/source/hassio/installation.markdown b/source/hassio/installation.markdown
new file mode 100644
index 00000000000..00eeb6a0589
--- /dev/null
+++ b/source/hassio/installation.markdown
@@ -0,0 +1,12 @@
+---
+layout: page
+title: "Installing Hass.io"
+description: "Instructions how to install Hass.io."
+date: 2017-04-30 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+[Placeholder]