diff --git a/source/_includes/asides/hassio_navigation.html b/source/_includes/asides/hassio_navigation.html
index f5a716b278e..b779b60a51d 100644
--- a/source/_includes/asides/hassio_navigation.html
+++ b/source/_includes/asides/hassio_navigation.html
@@ -6,6 +6,7 @@
         {% active_link /hassio/ Hass.io %}
         <ul>
           <li>{% active_link /hassio/installation/ Installation %}</li>
+          <li>{% active_link /hassio/debugging/ Debugging %}</li>
           <li>{% active_link /addons/ Available add-ons %}</li>
           <li>{% active_link /hassio/architecture/ Architecture %}</li>
         </ul>
diff --git a/source/hassio/debugging.markdown b/source/hassio/debugging.markdown
new file mode 100644
index 00000000000..5d01e7d2af4
--- /dev/null
+++ b/source/hassio/debugging.markdown
@@ -0,0 +1,33 @@
+---
+layout: page
+title: "Debugging Hass.io"
+description: "Tips and tricks for when things go wrong."
+date: 2017-04-30 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+The following debug tips and tricks are for people who are running the Hass.io image. If you use the generic Linux installer script, you should be able to access your host and logs as per your host.
+
+## {% linkable_title SSH acces to the host %}
+
+Create an `authorized_keys` file in the root of your SD card with your public key. Once the device is booted, you can acces your device as root over SSH on port 22222.
+
+Windows instructions how to generate and use private/public keys with Putty are [here][windows-keys]. Instead of the droplet instructions, add the public key as per above instructions.
+
+## {% linkable_title Checking the logs %}
+
+```bash
+# Logs from the supervisor service on the Host OS
+journalctl -f -u resin-supervisor.service
+
+# Hass.io supervisor logs
+docker logs hassio_supervisor
+
+# Home Assistant logs
+docker logs homeassistant
+```
+
+[windows-keys]: https://www.digitalocean.com/community/tutorials/how-to-use-ssh-keys-with-putty-on-digitalocean-droplets-windows-users
\ No newline at end of file