diff --git a/Gemfile b/Gemfile
index 7c767a72f86..a1d627a356a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,6 +20,7 @@ end
 
 group :jekyll_plugins do
   gem 'jekyll-paginate'
+  gem 'jekyll-redirect-from'
   gem 'jekyll-sitemap'
   gem 'jekyll-time-to-read'
   gem 'octopress', '~> 3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index a3056e867c4..a64797568a6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,6 +27,8 @@ GEM
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
     jekyll-paginate (1.1.0)
+    jekyll-redirect-from (0.11.0)
+      jekyll (>= 2.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
     jekyll-sitemap (0.11.0)
@@ -118,6 +120,7 @@ DEPENDENCIES
   haml (~> 4.0)
   jekyll (~> 3.0)
   jekyll-paginate
+  jekyll-redirect-from
   jekyll-sitemap
   jekyll-time-to-read
   octopress (~> 3.0)
diff --git a/_config.yml b/_config.yml
index 1b7ab55bebb..545f65d9f55 100644
--- a/_config.yml
+++ b/_config.yml
@@ -49,6 +49,7 @@ kramdown:
 highlighter: rouge
 
 gems:
+  - jekyll-redirect-from
   - jekyll-time-to-read
   - octopress-filters
   - octopress-include-tag
diff --git a/source/_includes/asides/getting_started_navigation.html b/source/_includes/asides/getting_started_navigation.html
index abb7fb41210..e1be992d947 100644
--- a/source/_includes/asides/getting_started_navigation.html
+++ b/source/_includes/asides/getting_started_navigation.html
@@ -67,7 +67,7 @@
       </li>
       <li>{% active_link {{site_root}}/topics/ Advanced Topics %}</li>
       <li>{% active_link {{site_root}}/details/ Details %}</li>
-      <li>{% active_link /getting-started/android/ Add to Android Homescreen %}</li>
+      <li>{% active_link /getting-started/mobile/ Add to Android/iOS Homescreen %}</li>
       <li>{% active_link /getting-started/browsers/ Browser Compatibility List %}</li>
     </ul>
   </div>
diff --git a/source/getting-started/android.markdown b/source/getting-started/mobile.markdown
similarity index 93%
rename from source/getting-started/android.markdown
rename to source/getting-started/mobile.markdown
index 2ef656adf82..8654bc3f755 100644
--- a/source/getting-started/android.markdown
+++ b/source/getting-started/mobile.markdown
@@ -7,11 +7,12 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+redirect_from: /getting-started/android/
 ---
 
 Home Assistant is not available on the Play Store or App Store. Instead, Home Assistant leverages the new W3C [manifest.json](https://w3c.github.io/manifest/) support, allowing mobile devices to add the "web app" to your homescreen as if it was native.
 
-On Android:
+# On Android:
 
   1. Open Chrome
   2. Navigate to your Home Assistant instance
@@ -23,7 +24,7 @@ On Android:
 <img src='/images/screenshots/android-homescreen-guide.gif' />
 </p>
 
-On iOS:
+# On iOS:
 
   1. Open Safari
   2. Navigate to your Home Assistant instance