diff --git a/addons/check_config/index.html b/addons/check_config/index.html
index 567c05f8c6..420b714b31 100644
--- a/addons/check_config/index.html
+++ b/addons/check_config/index.html
@@ -91,6 +91,7 @@
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/addons/duckdns/index.html b/addons/duckdns/index.html
index 05a5ff24f8..523d915b6a 100644
--- a/addons/duckdns/index.html
+++ b/addons/duckdns/index.html
@@ -94,6 +94,7 @@
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/addons/index.html b/addons/index.html
index 9e29fcdeb0..161cefa3a0 100644
--- a/addons/index.html
+++ b/addons/index.html
@@ -91,6 +91,7 @@
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a class='active' href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/addons/lets_encrypt/index.html b/addons/lets_encrypt/index.html
index a0dc3c9241..240de0c404 100644
--- a/addons/lets_encrypt/index.html
+++ b/addons/lets_encrypt/index.html
@@ -103,6 +103,7 @@ This add-on need port 80/443 to verify the certificate request, please stop all
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/addons/mosquitto/index.html b/addons/mosquitto/index.html
index 636eacec78..701cd21be7 100644
--- a/addons/mosquitto/index.html
+++ b/addons/mosquitto/index.html
@@ -99,6 +99,7 @@
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/addons/nginx_proxy/index.html b/addons/nginx_proxy/index.html
index 60e737932d..40c9604c8a 100644
--- a/addons/nginx_proxy/index.html
+++ b/addons/nginx_proxy/index.html
@@ -91,6 +91,7 @@
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/addons/samba/index.html b/addons/samba/index.html
index 66b98454ea..53020ec8f6 100644
--- a/addons/samba/index.html
+++ b/addons/samba/index.html
@@ -103,6 +103,7 @@
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/addons/ssh/index.html b/addons/ssh/index.html
index aedd1878dd..27b57e9ef6 100644
--- a/addons/ssh/index.html
+++ b/addons/ssh/index.html
@@ -96,6 +96,7 @@ This add-on is not compatible when you installed Hass.io via the generic Linux i
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/atom.xml b/atom.xml
index e49531fa5f..16510bffae 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="https://home-assistant.io/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml
index d92732bb30..f7e47a5839 100644
--- a/blog/categories/announcements/atom.xml
+++ b/blog/categories/announcements/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Announcements | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/announcements/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 9a74e7c03d..bec89e9cfd 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Community | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml
index f675815010..44e8596fc8 100644
--- a/blog/categories/device-tracking/atom.xml
+++ b/blog/categories/device-tracking/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Device-Tracking | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/device-tracking/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index ef6ac1be67..af8b2fe34f 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 8c629ed879..403fb0c426 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: How-To | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 4958597a2b..113318e0ca 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: iBeacons | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index 2457e26b8a..f901c6f96e 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml
index 443b86d526..aafba352f7 100644
--- a/blog/categories/iot-data/atom.xml
+++ b/blog/categories/iot-data/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: IoT-Data | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/iot-data/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml
index 0864907d1e..163ddebd33 100644
--- a/blog/categories/merchandise/atom.xml
+++ b/blog/categories/merchandise/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Merchandise | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/merchandise/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml
index 1f970f3027..38844caa37 100644
--- a/blog/categories/micropython/atom.xml
+++ b/blog/categories/micropython/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Micropython | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/micropython/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index 6cea40f0e7..10e2375de2 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: MQTT | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index d9a580baf8..783dc37850 100644
--- a/blog/categories/organisation/atom.xml
+++ b/blog/categories/organisation/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organisation | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index bd9b7bf187..4b43c0dc6e 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index 99e4239522..7eb6a48acd 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index 041d5654bb..9e743bed28 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index cf2afe928c..5cba9cb265 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index 7dea75886d..7a9eff83ea 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Survey | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index f1460782a1..5be015cfde 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Talks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index 4e91084e66..a25b63f004 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Technology | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index 2e2fa82e57..03f966a0dc 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: User-Stories | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index 83d0cbd1ee..cabc49a305 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Video | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index f2ba6888ee..442891399a 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Website | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-18T16:29:47+00:00</updated>
+  <updated>2017-05-18T16:35:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/hassio/addon_config/index.html b/hassio/addon_config/index.html
index 8e541e78d3..4639f180c7 100644
--- a/hassio/addon_config/index.html
+++ b/hassio/addon_config/index.html
@@ -258,6 +258,7 @@ CMD [ "/run.sh" ]
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/hassio/addon_development/index.html b/hassio/addon_development/index.html
index 6ee062e24e..64d5f2d8ab 100644
--- a/hassio/addon_development/index.html
+++ b/hassio/addon_development/index.html
@@ -83,6 +83,7 @@
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/hassio/addon_publishing/index.html b/hassio/addon_publishing/index.html
index 9d0da1963d..29a522100f 100644
--- a/hassio/addon_publishing/index.html
+++ b/hassio/addon_publishing/index.html
@@ -122,6 +122,7 @@ Starting Hass.io 0.26, it is possible to distribute add-ons that will be built o
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/hassio/addon_repository/index.html b/hassio/addon_repository/index.html
index ecaa0552bf..cae84631f2 100644
--- a/hassio/addon_repository/index.html
+++ b/hassio/addon_repository/index.html
@@ -120,6 +120,7 @@
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/hassio/addon_testing/index.html b/hassio/addon_testing/index.html
index 9df7106cc7..388776c118 100644
--- a/hassio/addon_testing/index.html
+++ b/hassio/addon_testing/index.html
@@ -96,6 +96,7 @@ Use <code class="highlighter-rouge">docker</code> to build the test addon: <code
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/hassio/addon_tutorial/index.html b/hassio/addon_tutorial/index.html
index ff57632ccb..eb5dcc407e 100644
--- a/hassio/addon_tutorial/index.html
+++ b/hassio/addon_tutorial/index.html
@@ -238,6 +238,7 @@ The Python 3 server will allow you to browse the /data folder.
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/hassio/architecture/index.html b/hassio/architecture/index.html
index d56f9e1a11..10ddd25871 100644
--- a/hassio/architecture/index.html
+++ b/hassio/architecture/index.html
@@ -98,6 +98,7 @@
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a class='active' href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/hassio/debugging/index.html b/hassio/debugging/index.html
index 679fc912b4..a7928fe48b 100644
--- a/hassio/debugging/index.html
+++ b/hassio/debugging/index.html
@@ -96,6 +96,7 @@ docker logs homeassistant
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/hassio/external_drive/index.html b/hassio/external_storage/index.html
similarity index 97%
rename from hassio/external_drive/index.html
rename to hassio/external_storage/index.html
index d5fc65cc97..21b35da7db 100644
--- a/hassio/external_drive/index.html
+++ b/hassio/external_storage/index.html
@@ -10,11 +10,11 @@
     <meta name="author" content="Home Assistant">
     <meta name="description" content="How to map external device on Hass.io.">
     <meta name="viewport" content="width=device-width">
-    <link rel="canonical" href="https://home-assistant.io/hassio/external_drive/">
+    <link rel="canonical" href="https://home-assistant.io/hassio/external_storage/">
     <meta property="fb:app_id" content="338291289691179">
     <meta property="og:title" content="External device">
     <meta property="og:site_name" content="Home Assistant">
-    <meta property="og:url" content="https://home-assistant.io/hassio/external_drive/">
+    <meta property="og:url" content="https://home-assistant.io/hassio/external_storage/">
     <meta property="og:type" content="website">
     <meta property="og:description" content="How to map external device on Hass.io.">
     <meta property="og:image" content="https://home-assistant.io/images/default-social.png">
@@ -60,7 +60,7 @@
       <div class="grid grid-center">
         <div class="grid__item two-thirds lap-one-whole palm-one-whole">
           <article class="page">
-    <div class='edit-github'><a href='https://github.com/home-assistant/home-assistant.github.io/tree/current/source/hassio/external_drive.markdown'>Edit this page on GitHub</a></div>
+    <div class='edit-github'><a href='https://github.com/home-assistant/home-assistant.github.io/tree/current/source/hassio/external_storage.markdown'>Edit this page on GitHub</a></div>
   <header>
     <h1 class="title indent">
       External Device
@@ -87,6 +87,7 @@ It is also possible to create a add-on that only mount stuff to <code class="hig
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a class='active' href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/hassio/index.html b/hassio/index.html
index bb35909a1c..ea27225023 100644
--- a/hassio/index.html
+++ b/hassio/index.html
@@ -82,6 +82,7 @@
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/hassio/installation/index.html b/hassio/installation/index.html
index 61dd2257ad..c063cc647b 100644
--- a/hassio/installation/index.html
+++ b/hassio/installation/index.html
@@ -101,6 +101,7 @@ If you copy over your existing Home Assistant configuration, make sure to enable
           <li><a class='active' href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a  href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/hassio/installing_third_party_addons/index.html b/hassio/installing_third_party_addons/index.html
index 0dc67e99b4..db793086e5 100644
--- a/hassio/installing_third_party_addons/index.html
+++ b/hassio/installing_third_party_addons/index.html
@@ -95,6 +95,7 @@ Add the urls of repositories (one per line) and then press “Save”. A new car
           <li><a  href='/hassio/installation/'>Installation </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
           <li><a class='active' href='/hassio/installing_third_party_addons/'>Installing third-party add-ons </a></li>
+          <li><a  href='/hassio/external_storage/'>External storage </a></li>
           <li><a  href='/hassio/architecture/'>Architecture </a></li>
         </ul>
       </li>
diff --git a/sitemap.xml b/sitemap.xml
index c3f9fd6a1c..ad5972981d 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -640,7 +640,7 @@
 <loc>https://home-assistant.io/developers/development_validation/</loc>
 </url>
 <url>
-<loc>https://home-assistant.io/hassio/external_drive/</loc>
+<loc>https://home-assistant.io/hassio/external_storage/</loc>
 </url>
 <url>
 <loc>https://home-assistant.io/developers/frontend/</loc>
@@ -3389,62 +3389,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:28+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:28+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:28+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:28+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:28+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:28+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:28+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:28+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:28+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:28+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:28+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:28+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:29+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:29+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2017-05-18T16:28:55+00:00</lastmod>
+<lastmod>2017-05-18T16:34:29+00:00</lastmod>
 </url>
 </urlset>