diff --git a/source/_includes/asides/getting_started_navigation.html b/source/_includes/asides/getting_started_navigation.html
index 21c7496446d..82bc03dedce 100644
--- a/source/_includes/asides/getting_started_navigation.html
+++ b/source/_includes/asides/getting_started_navigation.html
@@ -8,6 +8,7 @@
{% active_link /getting-started/ Installation %}
- {% active_link /getting-started/installation-raspberry-pi/ Raspberry Pi %}
+ - {% active_link /getting-started/installation-raspberry-pi-all-in-one/ Raspberry Pi All-In-One Installer %}
- {% active_link /getting-started/installation-docker/ Docker %}
- {% active_link /getting-started/installation-synology/ Synology NAS %}
- {% active_link /getting-started/installation-virtualenv/ VirtualEnv Linux Instructions %}
diff --git a/source/getting-started/installation-raspberry-pi-all-in-one.markdown b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
new file mode 100644
index 00000000000..5aebae50ca1
--- /dev/null
+++ b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
@@ -0,0 +1,49 @@
+---
+layout: page
+title: "Raspberry Pi All-In-One Installer"
+date: 2016-05-12 01:39
+comments: true
+sharing: true
+footer: true
+---
+
+Easily deploy a complete Home Assistant server, with Websocket MQTT and Z-Wave driver support using Fabric!
+
+Requirements before installation:
+
+* You have a Raspberry Pi with a fresh install of [Raspbian Jessie/Jessie-Lite](https://www.raspberrypi.org/downloads/raspbian/).
+* You are able to SSH into your Raspberry Pi
+* You have a computer running Python 3
+
+Installation instructions (all from your PC):
+
+ 1. Install fabric: `pip3 install fabric3`
+ 2. Clone the script: `git clone https://github.com/jbags81/fabric-home-assistant.git`
+ 3. Change directory: `cd fabric-home-assistant`
+ 4. Edit `fabfile.py` and add the host info of your Raspberry Pi.
+ 5. Build your new Home Assistant server: `fab deploy`
+ 6. Reboot your Raspberry Pi
+
+Once rebooted, your Raspberry Pi will be up and running with Home Assistant. You can access it from **http://your_raspberry_pi_ip:8123**.
+
+The Home Assistant config is located at `/home/hass`. The virtualenv with the Home Assistant installation is located at `/srv/hass/hass_venv`.
+
+The All-In-One Fabric script will do the following automatically:
+
+* Create all needed directories
+* Create needed service accounts
+* Install OS and Python dependencies
+* Setup a virtualenv to run Home Assistant and components inside.
+* Run as a service account
+* Install Home Assistant in a virtualenv
+* Build and install Mosquitto from source with websocket support
+* Build and Install Python-openzwave in the Home Assistant virtualenv
+* Add both Home Assistant and Mosquitto to systemd services to start at boot
+
+Fabric allows any of the underlying functions to be ran individually as well. Run `fab -l` to see a list of all callable jobs.
+
+Tested with:
+
+ * Raspbian Jessie
+ * Raspbian Jessie-Lite
+ * Debian 8 (Replace username "pi" in fabfile.py with debian user)