diff --git a/source/_includes/asides/hassio_navigation.html b/source/_includes/asides/hassio_navigation.html
index b779b60a51d..0b7d9e04d81 100644
--- a/source/_includes/asides/hassio_navigation.html
+++ b/source/_includes/asides/hassio_navigation.html
@@ -16,6 +16,7 @@
       <li>
         {% active_link /hassio/addon_development/ Add-on Development %}
         <ul>
+          <li>{% active_link /hassio/addon_tutorial/ Tutorial: Making your first add-on %}</li>
           <li>{% active_link /hassio/addon_config/ Configuration %}</li>
           <li>{% active_link /hassio/addon_testing/ Local Testing %}</li>
           <li>{% active_link /hassio/addon_publishing/ Publishing %}</li>
diff --git a/source/hassio/addon_config.markdown b/source/hassio/addon_config.markdown
index 209835b1311..dc4d6700b48 100644
--- a/source/hassio/addon_config.markdown
+++ b/source/hassio/addon_config.markdown
@@ -85,7 +85,7 @@ The config for an add-on is stored in `config.json`.
 | url | no | Homepage of the addon. Here you can explain the add-ons and options.
 | startup | yes | `before` homeassistant will start. `after` homeassistant will start or `once` for application they don't run as deamon.
 | boot | yes | `auto` by system and manual or only `manual`
-| ports | no | Network ports they will be expose in docker style
+| ports | no | Network ports to expose from the container. Format is `"container-port/type": host-port`.
 | map | no | List of maps for additional hass.io folders. Possible values: `config`, `ssl`, `addons`, `backup`
 | options | yes | Default options value of the add-on
 | schema | yes | Schema for options value of the add-on
diff --git a/source/hassio/addon_tutorial.markdown b/source/hassio/addon_tutorial.markdown
new file mode 100644
index 00000000000..3558576d0ec
--- /dev/null
+++ b/source/hassio/addon_tutorial.markdown
@@ -0,0 +1,186 @@
+---
+layout: page
+title: "Tutorial: Making your first add-on"
+description: "Easy tutorial to get started making your first add-on."
+date: 2017-05-12 13:28
+sidebar: true
+comments: false
+sharing: true
+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!
+
+## {% linkable_title Step 1: The basics %}
+
+ - Create a new directory called `hello_world`
+ - Inside that directory create three files.
+
+`Dockerfile`:
+```
+FROM %%BASE_IMAGE%%
+
+ENV VERSION %%VERSION%%
+ENV LANG C.UTF-8
+
+# Copy data for add-on
+COPY run.sh /
+RUN chmod a+x /run.sh
+
+CMD [ "/run.sh" ]
+```
+
+`config.json`:
+```json
+{
+  "name": "Hello world",
+  "version": "0.1",
+  "slug": "hello_world",
+  "description": "My first real add-on!",
+  "startup": "before",
+  "boot": "auto",
+  "options": {},
+  "schema": {}
+}
+```
+
+`run.sh`:
+```bash
+echo Hello from my first add-on!
+```
+
+## {% linkable_title Step 2: Installing and testing your add-on %}
+
+Now comes the fun part, time to open the Hass.io UI and install and run your add-on.
+
+ - Open the Home Assistant frontend
+ - Go to the Hass.io panel
+ - On the top right click the shopping basket to go to the add-on store.
+
+<p class='img'>
+<img src='/images/hassio/tutorial/main_panel_store_icon.png' />
+From the Hass.io main panel open the add-on store.
+</p>
+
+ - On the top right click the refresh button
+ - You should now see a new card called "Local" that lists your add-on!
+
+<p class='img'>
+<img src='/images/hassio/tutorial/local_repository.png' />
+The Hass.io add-on store will list all available local add-ons.
+</p>
+
+ - Click on your add-on to go to the add-on details page.
+ - Install your add-on
+ - Start your add-on
+ - Refresh the logs of your add-on, you should now see "Hello world!" in your logs.
+
+<p class='img'>
+<img src='/images/hassio/tutorial/addon_hello_world_logs.png' />
+The add-on will print Hello world to the logs and then quit.
+</p>
+
+### {% linkable_title I don't see my add-on?! %}
+
+Oops! You clicked refresh in the store and your add-on didn't show up. Or maybe you just updated an option, clicked refresh and saw your add-on disappear.
+
+When this happens, it means that your `config.json` is invalid. It's either invalid JSON or one of the specified options is incorrect. To see what went wrong, go to the Hass.io panel and in the supervisor card click on "View logs". This should bring you to a page with the logs of the supervisor. Scroll to the bottom and you should be able to find the validation error.
+
+Once you fixed the error, go to the add-on store and click refresh again.
+
+## {% linkable_title Step 3: Hosting a server %}
+
+Until now we've been able to do some basic stuff, but it's not very useful yet. So let's take it one step further and host a server that we expose on a port. For this we're going to use the built-in HTTP server that comes with Python 3.
+
+To do this, we will need to update our files as follows:
+
+ - `Dockerfile`: Install Python 3
+ - `config.json`: Make the port from the container available on the host
+ - `run.sh`: Run the Python 3 command to start the HTTP server
+
+Add to your `Dockerfile` before `RUN`:
+
+```
+# Install requirements for add-on
+RUN apk add --no-cache python3
+
+# Set directory for Python 3 HTTP server to serve
+WORKDIR /data
+```
+
+Add "ports" to `config.json`. This will make TCP on port 8000 inside the container available on the host on port 8000.
+
+```json
+{
+  "name": "Hello world",
+  "version": "0.2",
+  "slug": "hello_world",
+  "description": "My first real add-on!",
+  "startup": "before",
+  "boot": "auto",
+  "options": {},
+  "schema": {},
+  "ports": {
+    "8000/tcp": 8000
+  }
+}
+```
+
+Update `run.sh` to start the Python 3 server:
+
+```
+python3 -m http.server
+```
+
+## {% linkable_title Step 4: Installing the update %}
+
+Since we updated the version number in our `config.json`, Home Assistant will show an update button when looking at the add-on details. You might have to refresh your browser or click the refresh button in the add-on store for it to show up. If you did not update the version number, you can also uninstall and install the add-on again. After installing the add-on again, make sure you start it.
+
+Now navigate to [http://hassio.local:8000] to see our server in action!
+
+<p class='img'>
+<img src='/images/hassio/tutorial/python3-http-server.png' />
+The Python 3 server will allow you to browse the /data folder.
+</p>
+
+## {% linkable_title Bonus: Working with add-on options %}
+
+In the screenshot you've probably seen that our server only served up 1 file: `options.json`. This file contains the user configuration for this add-on. Because we specified an empty "config" and "schema" in our `config.json`, the file is currently empty.
+
+Let's see if we can get some data into that file!
+
+To do this, we need to specify the default options and a schema for the user to change the options.
+
+Change the options and schema entries in your `config.json` with the following:
+
+```json
+{
+  …
+
+  "options": {
+    "beer": true,
+    "wine": true,
+    "liquor": false,
+    "name": "world",
+    "year": 2017
+  },
+  "schema": {
+    "beer": "bool",
+    "wine": "bool",
+    "liquor": "bool",
+    "name": "str",
+    "year": "int"
+  },
+
+  …
+}
+```
+
+Refresh the add-on store and re-install your add-on. You will now see the options available in the add-on config screen. When you now go back to our Python 3 server and download `options.json`, you'll see the options you set.
+
+ - [Learn more about the available schema options.](/hassio/addon_config/#options--schema)
+ - [See how options.json can be used inside `run.sh`](https://github.com/home-assistant/hassio-addons/blob/master/mosquitto/run.sh#L4-L6)
+
+### [Next step: Add-on config reference &raquo;](/hassio/addon_config/)
diff --git a/source/images/hassio/tutorial/addon_hello_world_logs.png b/source/images/hassio/tutorial/addon_hello_world_logs.png
new file mode 100644
index 00000000000..4ea603e7354
Binary files /dev/null and b/source/images/hassio/tutorial/addon_hello_world_logs.png differ
diff --git a/source/images/hassio/tutorial/local_repository.png b/source/images/hassio/tutorial/local_repository.png
new file mode 100644
index 00000000000..f22de6adcdb
Binary files /dev/null and b/source/images/hassio/tutorial/local_repository.png differ
diff --git a/source/images/hassio/tutorial/main_panel_store_icon.png b/source/images/hassio/tutorial/main_panel_store_icon.png
new file mode 100644
index 00000000000..a6b04be1134
Binary files /dev/null and b/source/images/hassio/tutorial/main_panel_store_icon.png differ
diff --git a/source/images/hassio/tutorial/python3-http-server.png b/source/images/hassio/tutorial/python3-http-server.png
new file mode 100644
index 00000000000..e60cc8a766a
Binary files /dev/null and b/source/images/hassio/tutorial/python3-http-server.png differ