diff --git a/source/_includes/asides/hassio_navigation.html b/source/_includes/asides/hassio_navigation.html
index d29e2ac6089..6c42ff0ca6d 100644
--- a/source/_includes/asides/hassio_navigation.html
+++ b/source/_includes/asides/hassio_navigation.html
@@ -15,6 +15,7 @@
       <li>
         Advanced
         <ul>
+          <li>{% active_link /hassio/commandline/ Command line %}</li>
           <li>{% active_link /hassio/zwave/ Z-Wave %}</li>
           <li>{% active_link /hassio/external_storage/ External storage %}</li>
           <li>{% active_link /hassio/run_local/ Execute local things %}</li>
diff --git a/source/hassio/commandline.markdown b/source/hassio/commandline.markdown
new file mode 100644
index 00000000000..bec31542584
--- /dev/null
+++ b/source/hassio/commandline.markdown
@@ -0,0 +1,77 @@
+---
+layout: page
+title: "Hass.io via the Command line"
+description: "Command line utility to control Hass.io."
+date: 2017-04-30 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+<p class='img'>
+<img src='/images/hassio/screenshots/ssh-upgrade.png'>
+Hass.io upgrade process from the SSH command line
+</p>
+
+On the SSH command line, you can use the `hassio` command to retrieve logs, check the details of connected hardware, and more.
+
+Home Assistant:
+
+```bash
+$ hassio homeassistant logs
+$ hassio homeassistant restart
+$ hassio homeassistant stop
+$ hassio homeassistant start
+$ hassio homeassistant update
+$ hassio homeassistant check
+```
+
+Host:
+
+```bash
+$ hassio host hardware
+$ hassio host reboot
+$ hassio host shutdown
+$ hassio host update
+```
+
+Supervisor
+
+```bash
+$ hassio supervisor logs
+$ hassio supervisor info
+$ hassio supervisor reload
+$ hassio supervisor update
+```
+
+You can get a better description of the CLI capabilities by typing `hassio help`:
+
+```bash
+NAME:
+   hassio - Commandline tool to allow interaction with hass.io
+
+USAGE:
+   hassio [global options] command [command options] [arguments...]
+
+VERSION:
+   1.2.1
+
+AUTHOR:
+   Home-Assistant <hello@home-assistant.io>
+
+COMMANDS:
+     homeassistant, ha  info, logs, check, restart, start, stop, update
+     supervisor, su     info, logs, reload, update
+     host, ho           hardware, reboot, shutdown, update
+     network, ne        info, options
+     snapshots, sn      list, info, reload, new, restore, remove
+     addons, ad         list, info, logo, changelog, logs, stats,
+ reload, start, stop, install, uninstall, update
+     help, h  Shows a list of commands or help for one command
+
+GLOBAL OPTIONS:
+   --debug, -d    Prints Debug information
+   --help, -h     show help
+   --version, -v  print the version
+```
diff --git a/source/hassio/index.markdown b/source/hassio/index.markdown
index 985b06f9475..c26320cdf8e 100644
--- a/source/hassio/index.markdown
+++ b/source/hassio/index.markdown
@@ -38,10 +38,6 @@ Hass.io users can update Home Assistant via the 'Hass.io' page in the UI. Howeve
 Hass.io dashboard with upgrade notification (under the hamburger menu -> Hass.io)
 </p>
 
-<p class='img'>
-<img src='/images/hassio/screenshots/ssh-upgrade.png'>
-Hass.io upgrade process from the SSH command line
-</p>
 
 [Google Assistant]: /addons/google_assistant/
 [Snips.ai]: /addons/snips/
@@ -54,67 +50,3 @@ Hass.io upgrade process from the SSH command line
 [HassOS]: https://github.com/home-assistant/hassos
 [Docker]: https://www.docker.com/
 [install]: /hassio/installation/
-
-## {% linkable_title hassio command %}
-
-On the SSH command line, you can use the `hassio` command to retrieve logs, check the details of connected hardware, and more.
-
-Home Assistant:
-
-```bash
-$ hassio homeassistant logs
-$ hassio homeassistant restart
-$ hassio homeassistant stop
-$ hassio homeassistant start
-$ hassio homeassistant update
-$ hassio homeassistant check
-```
-
-Host:
-
-```bash
-$ hassio host hardware
-$ hassio host reboot
-$ hassio host shutdown
-$ hassio host update
-```
-
-Supervisor
-
-```bash
-$ hassio supervisor logs
-$ hassio supervisor info
-$ hassio supervisor reload
-$ hassio supervisor update
-```
-
-You can get a better description of the CLI capabilities by typing `hassio help`:
-
-```bash
-NAME:
-   hassio - Commandline tool to allow interaction with hass.io
-
-USAGE:
-   hassio [global options] command [command options] [arguments...]
-
-VERSION:
-   1.2.1
-
-AUTHOR:
-   Home-Assistant <hello@home-assistant.io>
-
-COMMANDS:
-     homeassistant, ha  info, logs, check, restart, start, stop, update
-     supervisor, su     info, logs, reload, update
-     host, ho           hardware, reboot, shutdown, update
-     network, ne        info, options
-     snapshots, sn      list, info, reload, new, restore, remove
-     addons, ad         list, info, logo, changelog, logs, stats,
- reload, start, stop, install, uninstall, update
-     help, h  Shows a list of commands or help for one command
-
-GLOBAL OPTIONS:
-   --debug, -d    Prints Debug information
-   --help, -h     show help
-   --version, -v  print the version
-```