diff --git a/source/getting-started/android.markdown b/source/getting-started/android.markdown
new file mode 100644
index 00000000000..6338899e541
--- /dev/null
+++ b/source/getting-started/android.markdown
@@ -0,0 +1,24 @@
+---
+layout: page
+title: "Getting started on Android"
+description: "Android instructions to add Home Assistant to your homescreen."
+date: 2015-03-08 21:36
+sidebar: false
+comments: false
+sharing: true
+footer: true
+---
+
+Home Assistant is not available on the Play Store. Instead, Home Assistant leverages the new [manifest.json support](https://w3c.github.io/manifest/) to allow Android devices to add the web application to your homescreen as if it was a native application.
+
+  1. Open Chrome
+  2. Navigate to your Home Assistant instance
+  3. Click on the menu icon (three vertical dots)
+  4. Click on Add to Homescreen
+  5. A dialog will popup, click on Add
+
+<p class='img' style='width:500px; margin-left: auto; margin-right: auto;'>
+<img src='/images/screenshots/android-homescreen-guide.gif' />
+</p>
+
+Some internet service providers will only offer dynamic IPs. This can cause you to be unable to access Home Assistant while being remote. You can solve this by using a free Dynamic DNS service like [No-IP](http://www.noip.com/).
diff --git a/source/getting-started/index.markdown b/source/getting-started/index.markdown
index 971f2396cd4..3ea6226848c 100644
--- a/source/getting-started/index.markdown
+++ b/source/getting-started/index.markdown
@@ -162,10 +162,6 @@ http:
   api_password: YOUR_PASSWORD
 ```
 
-<p class='note'>
-You can append <code>?api_password=YOUR_PASSWORD</code> to any url to log in automatically.
-</p>
-
 ### {% linkable_title Adding devices and services %}
 
 Home Assistant will be able to automatically discover and configure any Google Chromecasts, Belkin WeMo switches and Philips Hue bridges in your network if you have [the discovery component]({{site_root}}/components/discovery.html) enabled (which is by default).
@@ -187,3 +183,7 @@ When all your devices are set up it's time to put the cherry on the pie: automat
  * [Intruder alerts]({{site_root}}/components/simple_alarm.html) (built-in component)
  * [Setup your own automation rules]({{site_root}}/components/automation.html) (using configuration file)
  * [Create your own automation component]({{site_root}}/developers/creating_components.html) (writing Python code)
+
+### {% linkable_title Setting up your phone or tablet %}
+
+Home Assistant runs as a self hosted web application. Home Assistant contains support to be added to your homescreen. If you're on Android you can follow [the visual guide]({{site_root}}/getting-started/android.html). For other devices, open Home Assistant on your mobile browser and click on the add to homescreen option.
\ No newline at end of file
diff --git a/source/images/screenshots/android-homescreen-guide.gif b/source/images/screenshots/android-homescreen-guide.gif
new file mode 100644
index 00000000000..9f74e65bdd5
Binary files /dev/null and b/source/images/screenshots/android-homescreen-guide.gif differ