diff --git a/atom.xml b/atom.xml
index fa77199b28..afc4bdb7ca 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 9c4699bfce..62059fdf20 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 6e1067d94b..6cd552a5a2 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 a0a7724778..a567224260 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 a5d454c800..4cdfe56187 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 581bf4c1ed..c6c8afce66 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 8aa4606b5a..153f25d13d 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 f89c2c7d82..fac47cf65c 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 8ac6ba7123..5b37c27f3e 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 35648e0c05..09bfc61a9a 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 ee0f61e1ca..396cb4cc3e 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 80798bc072..b1b1678c21 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 2b968c2cfe..1591ab59b0 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 2f2e7f3487..9c972ca113 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 2786ce3a94..97f57cf0dc 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 3bbfcf33e0..3064a3f555 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 db8f273102..ddd020178d 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 64b88c67f6..e934cf2a78 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 65ff9491a6..6e3f53502f 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 716183655c..84f5a82d8a 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+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 9d907a0853..909a45326a 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>2016-09-29T05:20:59+00:00</updated>
+  <updated>2016-09-29T06:49:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/getting-started/android/index.html b/getting-started/android/index.html
index 1a7e69f245..a5510cefb2 100644
--- a/getting-started/android/index.html
+++ b/getting-started/android/index.html
@@ -136,6 +136,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/automation-action/index.html b/getting-started/automation-action/index.html
index 6a3f83fb3a..b485cf300d 100644
--- a/getting-started/automation-action/index.html
+++ b/getting-started/automation-action/index.html
@@ -166,6 +166,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/automation-condition/index.html b/getting-started/automation-condition/index.html
index c95e1905cc..0a0f242738 100644
--- a/getting-started/automation-condition/index.html
+++ b/getting-started/automation-condition/index.html
@@ -142,6 +142,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/automation-create-first/index.html b/getting-started/automation-create-first/index.html
index 48474d3884..b9078678a3 100644
--- a/getting-started/automation-create-first/index.html
+++ b/getting-started/automation-create-first/index.html
@@ -210,6 +210,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/automation-examples/index.html b/getting-started/automation-examples/index.html
index 8d7aa9b41d..f095acb8e0 100644
--- a/getting-started/automation-examples/index.html
+++ b/getting-started/automation-examples/index.html
@@ -164,6 +164,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/automation-templating/index.html b/getting-started/automation-templating/index.html
index ebe2b946c6..ac63adc2da 100644
--- a/getting-started/automation-templating/index.html
+++ b/getting-started/automation-templating/index.html
@@ -375,6 +375,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/automation-trigger/index.html b/getting-started/automation-trigger/index.html
index 16b6d5e1e3..3b7906ee81 100644
--- a/getting-started/automation-trigger/index.html
+++ b/getting-started/automation-trigger/index.html
@@ -243,6 +243,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/automation-troubleshooting/index.html b/getting-started/automation-troubleshooting/index.html
index 6a1486d1be..43208fccdd 100644
--- a/getting-started/automation-troubleshooting/index.html
+++ b/getting-started/automation-troubleshooting/index.html
@@ -123,6 +123,7 @@ INFO [homeassistant.components.automation] Initialized rule Rain is over
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/automation/index.html b/getting-started/automation/index.html
index b89c9a6b81..3bcf107b3d 100644
--- a/getting-started/automation/index.html
+++ b/getting-started/automation/index.html
@@ -173,6 +173,7 @@ The difference between a condition and a trigger can be confusing as they are ve
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/autostart-macos/index.html b/getting-started/autostart-macos/index.html
index c7376ecdf9..93b19ee01e 100644
--- a/getting-started/autostart-macos/index.html
+++ b/getting-started/autostart-macos/index.html
@@ -130,6 +130,7 @@ Home Assistant has been uninstalled.
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/autostart-synology/index.html b/getting-started/autostart-synology/index.html
index 7c660e8090..492186145d 100644
--- a/getting-started/autostart-synology/index.html
+++ b/getting-started/autostart-synology/index.html
@@ -149,6 +149,7 @@ stop on runlevel <span class="o">[</span>06]
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/autostart-systemd/index.html b/getting-started/autostart-systemd/index.html
index fcb18a3f75..614a23fd07 100644
--- a/getting-started/autostart-systemd/index.html
+++ b/getting-started/autostart-systemd/index.html
@@ -175,6 +175,7 @@ EOF'</span>
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/autostart-upstart/index.html b/getting-started/autostart-upstart/index.html
index 4ba6e980b7..bd65f452f9 100644
--- a/getting-started/autostart-upstart/index.html
+++ b/getting-started/autostart-upstart/index.html
@@ -131,6 +131,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/autostart/index.html b/getting-started/autostart/index.html
index 733cb95565..b8e78663d7 100644
--- a/getting-started/autostart/index.html
+++ b/getting-started/autostart/index.html
@@ -119,6 +119,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/basic/index.html b/getting-started/basic/index.html
index 960c06ae9c..ef56ad7957 100644
--- a/getting-started/basic/index.html
+++ b/getting-started/basic/index.html
@@ -168,6 +168,7 @@ If you are planing to expose your Home Assistant instance to the internet and do
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/browsers/index.html b/getting-started/browsers/index.html
index f307a12758..ac3726a26a 100644
--- a/getting-started/browsers/index.html
+++ b/getting-started/browsers/index.html
@@ -324,6 +324,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/configuration/index.html b/getting-started/configuration/index.html
index d512ab9bc3..1b6f36e2ea 100644
--- a/getting-started/configuration/index.html
+++ b/getting-started/configuration/index.html
@@ -153,6 +153,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/customizing-devices/index.html b/getting-started/customizing-devices/index.html
index 2d3876fc70..7e83030587 100644
--- a/getting-started/customizing-devices/index.html
+++ b/getting-started/customizing-devices/index.html
@@ -250,6 +250,7 @@ New customize information will be applied the next time the state of the entity
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/devices/index.html b/getting-started/devices/index.html
index 5934ea14b6..b49d51b1c7 100644
--- a/getting-started/devices/index.html
+++ b/getting-started/devices/index.html
@@ -170,6 +170,7 @@ Each group consists of a name and a list of entity IDs. Entity IDs can be retrie
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/index.html b/getting-started/index.html
index 9bbf7db75d..520f0db807 100644
--- a/getting-started/index.html
+++ b/getting-started/index.html
@@ -156,6 +156,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/installation-docker/index.html b/getting-started/installation-docker/index.html
index f3718c7dba..32f70f09ea 100644
--- a/getting-started/installation-docker/index.html
+++ b/getting-started/installation-docker/index.html
@@ -144,6 +144,7 @@ To do that you have 2 options.</p>
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a class='active' href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/installation-raspberry-pi-all-in-one/index.html b/getting-started/installation-raspberry-pi-all-in-one/index.html
index d375f3bd79..62310c7478 100644
--- a/getting-started/installation-raspberry-pi-all-in-one/index.html
+++ b/getting-started/installation-raspberry-pi-all-in-one/index.html
@@ -207,6 +207,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a class='active' href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
@@ -299,21 +300,6 @@
   (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
-</script>
-<script>
-  var disqus_shortname = 'home-assistant';
-  
-    
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/getting-started/installation-raspberry-pi-all-in-one/';
-    var disqus_url = 'https://home-assistant.io/getting-started/installation-raspberry-pi-all-in-one/';
-    var disqus_script = 'embed.js';
-  
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
 </script>
   </body>
 </html>
\ No newline at end of file
diff --git a/getting-started/installation-raspberry-pi-image/index.html b/getting-started/installation-raspberry-pi-image/index.html
new file mode 100644
index 0000000000..5718cec04d
--- /dev/null
+++ b/getting-started/installation-raspberry-pi-image/index.html
@@ -0,0 +1,242 @@
+<!doctype html>
+  <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+  <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+  <!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
+  <!--[if gt IE 8]><!--> <html> <!--<![endif]-->
+
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>Hassbian image on a Raspberry Pi - Home Assistant</title>
+    <meta name="author" content="Home Assistant">
+    <meta name="description" content="Instructions to install the Home Assistant Hassbian image on a Raspberry Pi.">
+    
+    <meta name="viewport" content="width=device-width">
+    <link rel="canonical" href="https://home-assistant.io/getting-started/installation-raspberry-pi-image/">
+
+    <meta property="fb:app_id" content="338291289691179">
+    <meta property="og:title" content="Hassbian image on a Raspberry Pi">
+    <meta property="og:site_name" content="Home Assistant">
+    <meta property="og:url" content="https://home-assistant.io/getting-started/installation-raspberry-pi-image/">
+    <meta property="og:type" content="website">
+    <meta property="og:description" content="Instructions to install the Home Assistant Hassbian image on a Raspberry Pi.">
+    <meta property="og:image" content="https://home-assistant.io/images/default-social.png">
+    
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:site" content="@home_assistant">
+    
+    <meta name="twitter:title" content="Hassbian image on a Raspberry Pi">
+    <meta name="twitter:description" content="Instructions to install the Home Assistant Hassbian image on a Raspberry Pi.">
+    <meta name="twitter:image" content="https://home-assistant.io/images/default-social.png">
+
+    <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
+    <link rel='shortcut icon' href='/images/favicon.ico' />
+    <link rel='icon' type='image/png' href='/images/favicon-192x192.png' sizes='192x192' />
+  </head>
+
+  <body >
+
+    <header>
+      <div class="grid-wrapper">
+  <div class="grid">
+
+    <div class="grid__item three-tenths lap-two-sixths palm-one-whole ha-title">
+  <a href="/" class="site-title">
+    <img width='40' src='/demo/favicon-192x192.png'>
+    <span>Home Assistant</span>
+  </a>
+</div>
+
+<div class="grid__item seven-tenths lap-four-sixths palm-one-whole">
+  <nav>
+    <input type="checkbox" id="toggle">
+<label for="toggle" class="toggle" data-open="Main Menu" data-close="Close Menu"></label>
+<ul class="menu pull-right">
+  
+  <li><a href='/getting-started/'>Getting started</a></li>
+  <li><a href='/components/'>Components</a></li>
+  <li><a href='/cookbook/'>Examples</a></li>
+  <li><a href="/developers/">Developers</a></li>
+  <li><a href="/blog/">Blog</a></li>
+  <li><a href="/help/">Need help?</a></li>
+</ul>
+  </nav>
+</div>
+
+  </div>
+</div>
+    </header>
+
+    
+
+    <div class="grid-wrapper">
+      <div class="grid grid-center">
+        
+        <div class="grid__item two-thirds lap-one-whole palm-one-whole">
+        
+
+          <article class="page">
+  
+  
+
+  
+  <header>
+    <h1 class="title indent">
+      Hassbian Image on a Raspberry Pi
+    </h1>
+  </header>
+  <hr class="divider">
+  
+
+  <h3><a class="title-link" name="hassbian" href="#hassbian"></a> Hassbian</h3>
+
+<p>We finally have a Raspberry Pi image! It’s been named Hassbian in honor of Raspbian.
+This image comes pre-installed with the dependencies, permissions and so on for Home Assistant. Image is based on the same install instructions as the <a href="/getting-started/installation-raspberry-pi/">Manual installation</a>.<br />
+It’s based on Raspbian Lite and generated with a fork of the same <a href="https://github.com/home-assistant/pi-gen">script</a> that builds the <a href="raspberrypi.org/downloads/raspbian/">official Raspbian images</a>. Please note that this project has no association with the Raspberry Pi foundation or their projects.</p>
+
+<p>On first boot the latest release of Home Assistant will be installed in a <a href="getting-started/installation-virtualenv">Virtual Environment</a> at <code class="highlighter-rouge">/srv/homeassistant</code> and started as a service run by the user <code class="highlighter-rouge">homeassistant</code>. Since this is done automatically it’s required that the Raspberry Pi is connected to the internet with a ethernet cable. Installation takes about 5 minutes on first boot and after that you can connect to your Raspberry Pi on <code class="highlighter-rouge">ipaddress:8123</code>.</p>
+
+<p>Pre-installed on this image is the MQTT broker <a href="https://mosquitto.org/">Mosquitto</a>, Bluetooth support for none Bluetooth LE and settings for the <code class="highlighter-rouge">homeassistant</code> user to use the GPIO pins of the Raspberry Pi. Mosquitto is not activated by default.</p>
+
+<p>As it is today there is no pre-compiled Z-Wave support but it can be installed by following the <a href="/getting-started/z-wave/">Getting started instructions for Z-Wave</a>.</p>
+
+<p>For Raspberry Pi hardware specific components have a look at our <a href="/getting-started/installation-raspberry-pi/#raspberry-pi-hardware-specific-components">install guide for the Raspberry Pi</a>. Default password for the <code class="highlighter-rouge">pi</code> user is <code class="highlighter-rouge">raspberry</code> and is highly recommended to be changed.</p>
+
+<h3><a class="title-link" name="installation" href="#installation"></a> Installation</h3>
+
+<p>The image can be found as a <a href="https://github.com/home-assistant/pi-gen/releases">release</a> in the <a href="https://github.com/home-assistant/pi-gen/">pi-gen repository</a>.</p>
+
+<p>Installation instructions are the same as for Raspbian and it’s recommended to follow <a href="https://www.raspberrypi.org/documentation/installation/installing-images/README.md">these</a>.</p>
+
+<h3><a class="title-link" name="troubleshooting" href="#troubleshooting"></a> Troubleshooting</h3>
+
+<p>If you run into any issues, please see <a href="/getting-started/troubleshooting/">the troubleshooting page</a>. It contains solutions to many of the more commonly encountered issues.</p>
+
+<p>In addition to this site, check out these sources for additional help:</p>
+
+<ul>
+  <li><a href="https://community.home-assistant.io">Forum</a> for Home Assistant discussions and questions.</li>
+  <li><a href="https://gitter.im/home-assistant/home-assistant">Gitter Chat Room</a> for real-time chat about Home Assistant.</li>
+  <li><a href="https://github.com/home-assistant/home-assistant/issues">GitHub Page</a> for issue reporting.</li>
+</ul>
+
+<h3><a href="/getting-started/configuration/">Next step: Configuring Home Assistant »</a></h3>
+
+
+</article>
+
+
+        </div>
+
+        
+        <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
+          <div class="grid">
+  
+  
+    <section class="aside-module grid__item one-whole lap-one-half">
+  <div class='edit-github'><a href='https://github.com/home-assistant/home-assistant.github.io/tree/current/source/getting-started/installation-raspberry-pi-image.markdown'>Edit this page on GitHub</a></div>
+  <div class='section'>
+    <h1 class="title delta">Getting Started Guide</h1>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a  href='/getting-started/'>Installation </a>
+        <ul>
+          <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a class='active' href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
+          <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
+          <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
+          <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
+          <li><a  href='/getting-started/installation-virtualenv/'>Virtualenv Linux </a></li>
+          <li><a  href='/getting-started/updating/'>Updating </a></li>
+          <li><a  href='/getting-started/troubleshooting/'>Troubleshooting </a></li>
+        </ul>
+      </li>
+      <li>
+        <a  href='/getting-started/configuration/'>Configuration  </a>
+        <ul>
+          <li><a  href='/getting-started/yaml/'>YAML </a></li>
+          <li><a  href='/getting-started/basic/'>Basic information </a></li>
+          <li><a  href='/getting-started/devices/'>Setting up devices </a></li>
+          <li><a  href='/getting-started/customizing-devices/'>Customizing devices and services </a></li>
+          <li><a  href='/getting-started/presence-detection/'>Presence Detection </a></li>
+          <li><a  href='/getting-started/troubleshooting-configuration/'>Troubleshooting </a></li>
+        </ul>
+      </li>
+      <li>
+        <a  href='/getting-started/automation/'>Automation </a>
+        <ul>
+          <li><a  href='/getting-started/automation-create-first/'>Tutorial </a></li>
+          <li><a  href='/getting-started/automation-trigger/'>Triggers </a></li>
+          <li><a  href='/getting-started/automation-condition/'>Conditions </a></li>
+          <li><a  href='/getting-started/automation-action/'>Actions </a></li>
+          <li><a  href='/getting-started/automation-templating/'>Templates </a></li>
+        </ul>
+      </li>
+      <li>
+        <a  href='/getting-started/scripts/'>Scripts </a>
+        <ul>
+          <li><a  href='/getting-started/scripts-service-calls/'>Service Calls </a></li>
+          <li><a  href='/getting-started/scripts-conditions/'>Conditions </a></li>
+        </ul>
+      </li>
+      <li>
+        <a  href='/getting-started/z-wave/'>Z-Wave </a>
+        <ul>
+          <li><a  href='/getting-started/z-wave-controllers/'>Controllers </a></li>
+          <li><a  href='/getting-started/z-wave-settings/'>Modifying Settings </a></li>
+          <li><a  href='/getting-started/z-wave-device-specific/'>Device Specific </a></li>
+        </ul>
+      </li>
+      <li>
+        <a  href='/getting-started/autostart/'>Autostart </a>
+        <ul>
+          <li><a  href='/getting-started/autostart-systemd/'>Linux - systemd </a></li>
+          <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
+          <li><a  href='/getting-started/autostart-macos/'>OS X </a></li>
+          <li><a  href='/getting-started/autostart-synology/'>Synology NAS </a></li>
+        </ul>
+      </li>
+      <li><a  href='/topics/'>Advanced Topics </a></li>
+      <li><a  href='/getting-started/android/'>Add to Android Homescreen </a></li>
+      <li><a  href='/getting-started/browsers/'>Browser Compatibility List </a></li>
+    </ul>
+  </div>
+</section>
+  
+</div>
+        </aside>
+        
+      </div>
+    </div>
+
+    <footer>
+      <div class="grid-wrapper">
+  <div class="grid">
+    <div class="grid__item">
+      <div class="copyright">
+  <a rel="me" href='https://twitter.com/home_assistant'><i class="icon-twitter"></i></a>
+  <a rel="me" href='https://facebook.com/homeassistantio'><i class="icon-facebook"></i></a>
+  <a rel="me" href='https://plus.google.com/110560654828510104551'><i class="icon-google-plus"></i></a>
+  <a rel="me" href='https://github.com/home-assistant/home-assistant'><i class="icon-github"></i></a>
+
+  <div class="credit">
+    Contact us at <a href='mailto:hello@home-assistant.io'>hello@home-assistant.io</a>.<br>
+    Website powered by <a href='http://jekyllrb.com/'>Jekyll</a> and the <a href='https://github.com/coogie/oscailte'>Oscalite theme</a>.<br />
+    Hosted by <a href='https://pages.github.com/'>GitHub</a> and served by <a href='https://cloudflare.com'>CloudFlare</a>.
+  </div>
+</div>
+    </div>
+  </div>
+</div>
+    </footer>
+
+    <script>
+  var _gaq=[['_setAccount','UA-57927901-1'],['_trackPageview']];
+  (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+  g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+  s.parentNode.insertBefore(g,s)}(document,'script'));
+</script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/getting-started/installation-raspberry-pi/index.html b/getting-started/installation-raspberry-pi/index.html
index 2d08ca58fd..286528fce5 100644
--- a/getting-started/installation-raspberry-pi/index.html
+++ b/getting-started/installation-raspberry-pi/index.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Raspbian Lite on a Raspberry Pi - Home Assistant</title>
+    <title>Manual installation on a Raspberry Pi - Home Assistant</title>
     <meta name="author" content="Home Assistant">
     <meta name="description" content="Instructions to install Home Assistant on a Raspberry Pi runnning Raspbian Lite.">
     
@@ -15,7 +15,7 @@
     <link rel="canonical" href="https://home-assistant.io/getting-started/installation-raspberry-pi/">
 
     <meta property="fb:app_id" content="338291289691179">
-    <meta property="og:title" content="Raspbian Lite on a Raspberry Pi">
+    <meta property="og:title" content="Manual installation on a Raspberry Pi">
     <meta property="og:site_name" content="Home Assistant">
     <meta property="og:url" content="https://home-assistant.io/getting-started/installation-raspberry-pi/">
     <meta property="og:type" content="website">
@@ -25,7 +25,7 @@
     <meta name="twitter:card" content="summary_large_image">
     <meta name="twitter:site" content="@home_assistant">
     
-    <meta name="twitter:title" content="Raspbian Lite on a Raspberry Pi">
+    <meta name="twitter:title" content="Manual installation on a Raspberry Pi">
     <meta name="twitter:description" content="Instructions to install Home Assistant on a Raspberry Pi runnning Raspbian Lite.">
     <meta name="twitter:image" content="https://home-assistant.io/images/default-social.png">
 
@@ -83,7 +83,7 @@
   
   <header>
     <h1 class="title indent">
-      Raspbian Lite on a Raspberry Pi
+      Manual Installation on a Raspberry Pi
     </h1>
   </header>
   <hr class="divider">
@@ -91,6 +91,15 @@
 
   <h3><a class="title-link" name="installation" href="#installation"></a> Installation</h3>
 
+<p>There’s currently three documented ways to install Home Assistant on a Raspberry Pi.</p>
+<ul>
+  <li><a href="/getting-started/installation-raspberry-pi/#Manual-Installation">Manual installation</a>. Following this guide doing each step manually. This is highly recommended as a first installation since you get a good overview of the installation.</li>
+  <li><a href="/getting-started/installation-raspberry-pi-image">Hassbian image</a>. Basic installation with the same settings as following the manual installation guide. Some additional software is preinstalled to make installation quicker and easier.</li>
+  <li><a href="/getting-started/installation-raspberry-pi-all-in-one/">All-in-One Installer</a>. Fabric based installation script that installs and compiles many of the things an advanced Home Assistant install is likely to need.</li>
+</ul>
+
+<h3><a class="title-link" name="manual-installation" href="#manual-installation"></a> Manual Installation</h3>
+
 <p>This installation of Home Assistant requires the Raspberry Pi to run <a href="https://www.raspberrypi.org/downloads/raspbian/">Raspbian Lite</a>.
 The installation will be installed in a <a href="/getting-started/installation-virtualenv">Virtual Environment</a> with minimal overhead. Instructions assume this is a new installation of Raspbian Lite.</p>
 
@@ -266,6 +275,7 @@ To enable One Wire support add the following line to the end of <code class="hig
         <ul>
           <li><a class='active' href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/installation-synology/index.html b/getting-started/installation-synology/index.html
index 2f22d23a23..03c169f739 100644
--- a/getting-started/installation-synology/index.html
+++ b/getting-started/installation-synology/index.html
@@ -360,6 +360,7 @@ That’s it… you’re all set to go</p>
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a class='active' href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/installation-vagrant/index.html b/getting-started/installation-vagrant/index.html
index f3e76d38ce..429c365279 100644
--- a/getting-started/installation-vagrant/index.html
+++ b/getting-started/installation-vagrant/index.html
@@ -201,6 +201,7 @@ When using Vagrant on Windows, change git’s <code class="highlighter-rouge">au
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a class='active' href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/installation-virtualenv/index.html b/getting-started/installation-virtualenv/index.html
index 8e132787ad..91c460d6f4 100644
--- a/getting-started/installation-virtualenv/index.html
+++ b/getting-started/installation-virtualenv/index.html
@@ -232,6 +232,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/presence-detection/index.html b/getting-started/presence-detection/index.html
index d851249cad..4ce32e8d15 100644
--- a/getting-started/presence-detection/index.html
+++ b/getting-started/presence-detection/index.html
@@ -147,6 +147,7 @@ OwnTracks communicates directly with your MQTT broker, no data will pass through
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/scripts-conditions/index.html b/getting-started/scripts-conditions/index.html
index 596d4ebf5a..0ae87cc6e5 100644
--- a/getting-started/scripts-conditions/index.html
+++ b/getting-started/scripts-conditions/index.html
@@ -266,6 +266,7 @@ This allows you to mix several AND and OR conditions together.</p>
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/scripts-service-calls/index.html b/getting-started/scripts-service-calls/index.html
index c767861fe0..d1d8438af6 100644
--- a/getting-started/scripts-service-calls/index.html
+++ b/getting-started/scripts-service-calls/index.html
@@ -182,6 +182,7 @@ Service Data: <code class="highlighter-rouge"><span class="p">{</span><span clas
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/scripts/index.html b/getting-started/scripts/index.html
index c469ccb240..0db9522c7f 100644
--- a/getting-started/scripts/index.html
+++ b/getting-started/scripts/index.html
@@ -190,6 +190,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/troubleshooting-configuration/index.html b/getting-started/troubleshooting-configuration/index.html
index 42f5fd6b30..7c9a1f375e 100644
--- a/getting-started/troubleshooting-configuration/index.html
+++ b/getting-started/troubleshooting-configuration/index.html
@@ -190,6 +190,7 @@ Whenever you report an issue, be aware that we are volunteers who do not have ac
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/troubleshooting/index.html b/getting-started/troubleshooting/index.html
index 2d3d0a46bc..b367b5fee1 100644
--- a/getting-started/troubleshooting/index.html
+++ b/getting-started/troubleshooting/index.html
@@ -178,6 +178,7 @@ chrome -&gt; settings -&gt; site settings -&gt; storage -&gt; search for your UR
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/updating/index.html b/getting-started/updating/index.html
index 63d2e0ef4f..8af218e680 100644
--- a/getting-started/updating/index.html
+++ b/getting-started/updating/index.html
@@ -137,6 +137,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/yaml/index.html b/getting-started/yaml/index.html
index b7edfa7392..a6036745ee 100644
--- a/getting-started/yaml/index.html
+++ b/getting-started/yaml/index.html
@@ -164,6 +164,7 @@ The other properties (like name) are specified using mappings. Note that the sec
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/z-wave-controllers/index.html b/getting-started/z-wave-controllers/index.html
index 39a18d6433..c7bbf3a390 100644
--- a/getting-started/z-wave-controllers/index.html
+++ b/getting-started/z-wave-controllers/index.html
@@ -170,6 +170,7 @@ Upon first run, the <code class="highlighter-rouge">zwave</code> component will
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/z-wave-device-specific/index.html b/getting-started/z-wave-device-specific/index.html
index f522aead5b..7843d77fc5 100644
--- a/getting-started/z-wave-device-specific/index.html
+++ b/getting-started/z-wave-device-specific/index.html
@@ -192,6 +192,7 @@ Make sure you copy the newly saved <code class="highlighter-rouge">zwcfg_[home_i
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/z-wave-settings/index.html b/getting-started/z-wave-settings/index.html
index 8a8a8ae464..9863984de8 100644
--- a/getting-started/z-wave-settings/index.html
+++ b/getting-started/z-wave-settings/index.html
@@ -130,6 +130,7 @@
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/getting-started/z-wave/index.html b/getting-started/z-wave/index.html
index 0649552bb2..9a19f2f4f6 100644
--- a/getting-started/z-wave/index.html
+++ b/getting-started/z-wave/index.html
@@ -376,6 +376,7 @@ You can use this for automations.</p>
         <ul>
           <li><a  href='/getting-started/installation-raspberry-pi/'>Raspberry Pi </a></li>
           <li><a  href='/getting-started/installation-raspberry-pi-all-in-one/'>Raspberry Pi All-In-One Installer </a></li>
+          <li><a  href='/getting-started/installation-raspberry-pi-image/'>Raspberry Pi Image </a></li>
           <li><a  href='/getting-started/installation-docker/'>Docker </a></li>
           <li><a  href='/getting-started/installation-vagrant/'>Vagrant </a></li>
           <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
diff --git a/sitemap.xml b/sitemap.xml
index 1f73cb6aed..a790730436 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -502,6 +502,9 @@
 <loc>https://home-assistant.io/getting-started/installation-raspberry-pi-all-in-one/</loc>
 </url>
 <url>
+<loc>https://home-assistant.io/getting-started/installation-raspberry-pi-image/</loc>
+</url>
+<url>
 <loc>https://home-assistant.io/getting-started/installation-raspberry-pi/</loc>
 </url>
 <url>
@@ -2102,62 +2105,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2016-09-29T05:20:20+00:00</lastmod>
+<lastmod>2016-09-29T06:48:22+00:00</lastmod>
 </url>
 </urlset>