diff --git a/source/_addons/ssh.markdown b/source/_addons/ssh.markdown
index 6223abed42e..2d4da8096b0 100644
--- a/source/_addons/ssh.markdown
+++ b/source/_addons/ssh.markdown
@@ -9,7 +9,7 @@ sharing: true
 footer: true
 ---
 
-Setting up a [SSH](https://openssh.org/) server allows access to hass.io folders with SSH client. It also allows tunneling for access from an external network. Please note that you only need to do this on a ResinOS platform as most Linux flavors have their own SSH server.
+Setting up an [SSH](https://openssh.org/) server allows access to your Hass.io folders with any SSH client. To use this add-on, you must have a private/public key to log in. To generate them, follow the [instructions for Windows][win] and [these for other platforms][other].
 
 ```json
 {
@@ -22,3 +22,10 @@ Setting up a [SSH](https://openssh.org/) server allows access to hass.io folders
 Configuration variables:
 
 - **authorized_keys** (*Required*): Your public-keys for authorized keyfile. Every element will be a line inside that file.
+
+[win]: https://www.digitalocean.com/community/tutorials/how-to-create-ssh-keys-with-putty-to-connect-to-a-vps
+[other]: https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/
+
+<p class='note'>
+This add-on is not compatible when you installed Hass.io via the generic Linux installer.
+</p>
diff --git a/source/hassio/addon_tutorial.markdown b/source/hassio/addon_tutorial.markdown
index 1b686f00538..804872d2626 100644
--- a/source/hassio/addon_tutorial.markdown
+++ b/source/hassio/addon_tutorial.markdown
@@ -11,7 +11,25 @@ footer: true
 
 So you've got Home Assistant going and you've been enjoying the built-in add-ons but you're missing this one application. Time to make your own add-on! In Hass.io 0.24 we introduced the option to have local add-ons be build on your device. This is great for developing new add-ons locally.
 
-To get started with developing add-ons, we first need access to where Hass.io looks for local add-ons. You can choose to either enable the Samba add-on for this or use the SSH add-on. Once you have located your add-on directory, it's time to get started!
+To get started with developing add-ons, we first need access to where Hass.io looks for local add-ons. For this you can use the Samba add-on or the SSH add-on.
+
+For Samba, once you have enabled and started it, your Hass.io instance will show up in your local network tab and share a folder called "addons". This is the folder to store your custom add-ons.
+
+<p class='img'>
+<img src='/images/hassio/tutorial/samba.png' />
+With Samba add-on enabled, you can browse to your Hass.io server over the local network. It will contain an addons folder to store your local add-ons.
+</p>
+
+For SSH, you will have to install it. Before you can start it, you will have to have a private/public key pair and store your public key in the add-on config ([see docs for more info][ssh]). Once started, you can SSH to Hass.io and store your custom add-ons in "/addons".
+
+<p class='img'>
+<img src='/images/hassio/tutorial/ssh.png' />
+Once you SSH into your Hass.io box, you have access to your add-ons in "/addons".
+</p>
+
+Once you have located your add-on directory, it's time to get started!
+
+[ssh]: /addons/ssh/
 
 ## {% linkable_title Step 1: The basics %}
 
diff --git a/source/images/hassio/tutorial/samba.png b/source/images/hassio/tutorial/samba.png
new file mode 100644
index 00000000000..bcd2af8e6d1
Binary files /dev/null and b/source/images/hassio/tutorial/samba.png differ
diff --git a/source/images/hassio/tutorial/ssh.png b/source/images/hassio/tutorial/ssh.png
new file mode 100644
index 00000000000..d77b7d630a5
Binary files /dev/null and b/source/images/hassio/tutorial/ssh.png differ