diff --git a/atom.xml b/atom.xml
index 1318f8c1af..c8cf7c5e2a 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-04-17T09:46:27+00:00</updated>
+  <updated>2016-04-18T06:36:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/branding/atom.xml b/blog/categories/branding/atom.xml
index e1c5cd978e..9994fc76ce 100644
--- a/blog/categories/branding/atom.xml
+++ b/blog/categories/branding/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Branding | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/branding/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-04-17T09:46:27+00:00</updated>
+  <updated>2016-04-18T06:36:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 42d05c257a..09e5b25b6d 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-04-17T09:46:27+00:00</updated>
+  <updated>2016-04-18T06:36:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index adc535a9b9..4a9780aa6d 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-04-17T09:46:27+00:00</updated>
+  <updated>2016-04-18T06:36:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 41107ad22f..01c7e31680 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-04-17T09:46:27+00:00</updated>
+  <updated>2016-04-18T06:36:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index 94e5d067ba..6b7267e229 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-04-17T09:46:27+00:00</updated>
+  <updated>2016-04-18T06:36:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index a8b694f7ca..371426fa69 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-04-17T09:46:27+00:00</updated>
+  <updated>2016-04-18T06:36:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index 0c12b599a7..678280b176 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-04-17T09:46:27+00:00</updated>
+  <updated>2016-04-18T06:36:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index ea781f5af6..7b120bc227 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-04-17T09:46:27+00:00</updated>
+  <updated>2016-04-18T06:36:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index 418d31d262..f1e44e898d 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-04-17T09:46:27+00:00</updated>
+  <updated>2016-04-18T06:36:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index 62285aea8c..ae62800c98 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-04-17T09:46:27+00:00</updated>
+  <updated>2016-04-18T06:36:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 695bc42f2f..526afe92d8 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-04-17T09:46:27+00:00</updated>
+  <updated>2016-04-18T06:36:27+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/getting-started/android/index.html b/getting-started/android/index.html
index 2f0bd4e53b..9a6d0a0bae 100644
--- a/getting-started/android/index.html
+++ b/getting-started/android/index.html
@@ -140,7 +140,7 @@
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/automation/index.html b/getting-started/automation/index.html
index 3add40f0e7..1525e5d9b7 100644
--- a/getting-started/automation/index.html
+++ b/getting-started/automation/index.html
@@ -294,7 +294,7 @@
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/autostart-macos/index.html b/getting-started/autostart-macos/index.html
index 8bfda46214..b59fd87d24 100644
--- a/getting-started/autostart-macos/index.html
+++ b/getting-started/autostart-macos/index.html
@@ -150,7 +150,7 @@ Home Assistant has been uninstalled.
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/autostart-synology/index.html b/getting-started/autostart-synology/index.html
index ff5888c677..abb25e9d73 100644
--- a/getting-started/autostart-synology/index.html
+++ b/getting-started/autostart-synology/index.html
@@ -173,7 +173,7 @@ exec /bin/sh /volume1/homeassistant/hass-daemon start
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/autostart-systemd/index.html b/getting-started/autostart-systemd/index.html
index bdf8f41356..2314ba2402 100644
--- a/getting-started/autostart-systemd/index.html
+++ b/getting-started/autostart-systemd/index.html
@@ -198,7 +198,7 @@ $ sudo systemctl start home-assistant@[your user]
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a class='active' href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/autostart-upstart/index.html b/getting-started/autostart-upstart/index.html
index 2e1ef7a8e3..31e2a6991c 100644
--- a/getting-started/autostart-upstart/index.html
+++ b/getting-started/autostart-upstart/index.html
@@ -151,7 +151,7 @@ $ sudo service hass-daemon stop
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a class='active' href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/autostart/index.html b/getting-started/autostart/index.html
new file mode 100644
index 0000000000..6d1f06b66c
--- /dev/null
+++ b/getting-started/autostart/index.html
@@ -0,0 +1,183 @@
+<!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>Autostart Home Assistant - Home Assistant</title>
+    <meta name="author" content="Paulus Schoutsen">
+    <meta name="description" content="Instructions how to setup Home Assistant to launch on start.">
+    
+    <meta name="viewport" content="width=device-width">
+    <link rel="canonical" href="https://home-assistant.io/getting-started/autostart/">
+
+    <meta property="fb:app_id" content="338291289691179">
+    <meta property="og:title" content="Autostart Home Assistant">
+    <meta property="og:site_name" content="Home Assistant">
+    <meta property="og:url" content="https://home-assistant.io/getting-started/autostart/">
+    <meta property="og:type" content="website">
+    <meta property="og:description" content="Instructions how to setup Home Assistant to launch on start.">
+    <meta property="og:image" content="https://home-assistant.io/images/home-assistant-logo-2164x2164.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:site" content="@home_assistant">
+    
+    <meta name="twitter:title" content="Autostart Home Assistant">
+    <meta name="twitter:description" content="Instructions how to setup Home Assistant to launch on start.">
+    <meta name="twitter:image" content="https://home-assistant.io/images/home-assistant-logo-2164x2164.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">
+      Autostart Home Assistant
+    </h1>
+  </header>
+  <hr class="divider">
+  
+
+  <p>Once you get started with Home Assistant you want it to start automatically when you launch your machine. To help you get started we’ve compiled a few guides for different systems.</p>
+
+<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/">macOS</a></li>
+  <li><a href="/getting-started/autostart-synology/">Synology NAS</a></li>
+</ul>
+
+
+</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.io/tree/master/source/getting-started/autostart.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-docker/'>Docker </a></li>
+          <li><a  href='/getting-started/installation-synology/'>Synology NAS </a></li>
+          <li><a  href='/getting-started/installation-virtualenv/'>VirtualEnv Linux Instructions </a></li>
+          <li><a  href='/getting-started/troubleshooting/'>Troubleshooting </a></li>
+        </ul>
+      </li>
+      <li>
+        Configuration
+        <ul>
+          <li><a  href='/getting-started/configuration/'>Configuration.yaml  </a></li>
+          <li><a  href='/getting-started/devices/'>Setting up devices </a></li>
+          <li><a  href='/getting-started/presence-detection/'>Presence Detection </a></li>
+          <li><a  href='/getting-started/automation/'>Automation </a></li>
+          <li><a  href='/getting-started/troubleshooting-configuration/'>Troubleshooting configuration.yaml </a></li>
+        </ul>
+      </li>
+      <li>
+        <a class='active' href='/getting-started/autostart/'>Auto-start Home Assistant </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/'>macOS </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>
+    </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://github.com/home-assistant/home-assistant'><i class="icon-github"></i></a>
+
+  <div class="credit">
+    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/configuration/index.html b/getting-started/configuration/index.html
index c83ed73a3f..e2e1acbcbd 100644
--- a/getting-started/configuration/index.html
+++ b/getting-started/configuration/index.html
@@ -248,7 +248,7 @@ The other properties (like name) are specified using mappings. Note that the sec
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/devices/index.html b/getting-started/devices/index.html
index d25c02d687..b136dac859 100644
--- a/getting-started/devices/index.html
+++ b/getting-started/devices/index.html
@@ -227,7 +227,7 @@ Each group exists of a name and a list of entity IDs. Entity IDs can be retrieve
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/index.html b/getting-started/index.html
index bb6cd80148..668a045451 100644
--- a/getting-started/index.html
+++ b/getting-started/index.html
@@ -182,7 +182,7 @@ $ hass --open-ui
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/installation-docker/index.html b/getting-started/installation-docker/index.html
index 28f5e27701..f0a25b8356 100644
--- a/getting-started/installation-docker/index.html
+++ b/getting-started/installation-docker/index.html
@@ -154,7 +154,7 @@ When using boot2docker on OS X you are unable to map the local time to your Dock
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/installation-raspberry-pi/index.html b/getting-started/installation-raspberry-pi/index.html
index 9080342039..301acdbdd4 100644
--- a/getting-started/installation-raspberry-pi/index.html
+++ b/getting-started/installation-raspberry-pi/index.html
@@ -172,7 +172,7 @@ $ hass
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/installation-synology/index.html b/getting-started/installation-synology/index.html
index c35ad013d1..1025a172f8 100644
--- a/getting-started/installation-synology/index.html
+++ b/getting-started/installation-synology/index.html
@@ -377,7 +377,7 @@ That’s it… you’re all set to go</p>
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/installation-virtualenv/index.html b/getting-started/installation-virtualenv/index.html
index b30b2c2b58..d6172cb32c 100644
--- a/getting-started/installation-virtualenv/index.html
+++ b/getting-started/installation-virtualenv/index.html
@@ -264,7 +264,7 @@ sudo chown hass /srv/hass
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/presence-detection/index.html b/getting-started/presence-detection/index.html
index 0c4d829bec..464f5029d3 100644
--- a/getting-started/presence-detection/index.html
+++ b/getting-started/presence-detection/index.html
@@ -163,7 +163,7 @@ OwnTracks communicates directly with your MQTT broker, no data will pass through
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/troubleshooting-configuration/index.html b/getting-started/troubleshooting-configuration/index.html
index 67741a5e3c..b54be0b63d 100644
--- a/getting-started/troubleshooting-configuration/index.html
+++ b/getting-started/troubleshooting-configuration/index.html
@@ -211,7 +211,7 @@ Whenever you report an issue, be aware that we are volunteers who do not have ac
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/getting-started/troubleshooting/index.html b/getting-started/troubleshooting/index.html
index c429e0ac85..ff037d5f48 100644
--- a/getting-started/troubleshooting/index.html
+++ b/getting-started/troubleshooting/index.html
@@ -199,7 +199,7 @@ $ iptables-save &gt; /etc/network/iptables.rules  # your rules may be saved else
         </ul>
       </li>
       <li>
-        Auto-start Home Assistant
+        <a  href='/getting-started/autostart/'>Auto-start Home Assistant </a>
         <ul>
           <li><a  href='/getting-started/autostart-systemd/'>Linux - SystemD </a></li>
           <li><a  href='/getting-started/autostart-upstart/'>Linux - Upstart </a></li>
diff --git a/sitemap.xml b/sitemap.xml
index 1e3fe2a204..86e817559c 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -239,6 +239,9 @@
   <url>
     <loc>https://home-assistant.io/getting-started/autostart-upstart/</loc>
   </url>
+  <url>
+    <loc>https://home-assistant.io/getting-started/autostart/</loc>
+  </url>
   <url>
     <loc>https://home-assistant.io/developers/component_deps_and_reqs/</loc>
   </url>
@@ -1438,18 +1441,18 @@
     </url>
   <url>
     <loc>https://home-assistant.io/demo/frontend.html</loc>
-    <lastmod>2016-04-17T09:45:48+00:00</lastmod>
+    <lastmod>2016-04-18T06:35:46+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/index.html</loc>
-    <lastmod>2016-04-17T09:45:48+00:00</lastmod>
+    <lastmod>2016-04-18T06:35:46+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-    <lastmod>2016-04-17T09:45:48+00:00</lastmod>
+    <lastmod>2016-04-18T06:35:46+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-    <lastmod>2016-04-17T09:45:48+00:00</lastmod>
+    <lastmod>2016-04-18T06:35:46+00:00</lastmod>
   </url>
 </urlset>