diff --git a/source/_components/joaoapps_join.markdown b/source/_components/joaoapps_join.markdown
new file mode 100644
index 00000000000..827e587dd66
--- /dev/null
+++ b/source/_components/joaoapps_join.markdown
@@ -0,0 +1,51 @@
+---
+layout: page
+title: "Joaoapps Join"
+description: "Instructions for how to integrate the Join by Joaoapps service within Home Assistant."
+date: 2016-07-12 10:49
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: joaoapps_join.png
+ha_category: Hub
+ha_release: "0.24"
+---
+
+
+The Join platform exposes services from [Join](http://joaoapps.com/join).  In Home Assistant, the Join features are divided up in two locations, the Join component, and the Join notify platform.  The notify platform allows us to send messages to Join devices, the the component allows us to access the other special features that Join offers.
+
+In the configuartion.yaml you need to provide the device id of the target device. If you want to send to a group of devices, you need to provide an api key.  You can find you device id and api key [here](https://joinjoaomgcd.appspot.com/). 
+
+To set it up, add the following information to your `configuration.yaml` file:
+
+```yaml
+notify:
+  - platform: joaoapps_join
+    device_id: d5asdfasdf54645h45h368761dfe5gt8a
+    name: droid                                       *optional
+    api_key: asd97823jb628a34fwsdfwefd5384345tf2d     *optional
+
+joaoapps_join:
+  device_id: group.android
+  name: droid                                       
+  api_key: asd97823jb628a34fwsdfwefd5384345tf2d
+```
+
+The notify service has a few optional parameters such as icon and smallicon.  You can use them like so:
+
+```json
+{"message":"Hello!","title":"From Hass","data":{"icon":"https://goo.gl/KVqcYi","smallicon":"http://goo.gl/AU4Wf1"}}
+```
+
+The services exposed in the joaoapps_join component can be used with the service data described below:
+
+| Service                      	| Data                                                             	|
+|------------------------------	|------------------------------------------------------------------	|
+| joaoapps_join/ring           	|                                                                  	|
+| joaoapps_join/send_sms       	| {"number":"5553334444", "message":"Hello!"}                      	|
+| joaoapps_join/send_tasker    	| {"command":"test"}                                               	|
+| joaoapps_join/send_url       	| {"url":"http://google.com"}                                      	|
+| joaoapps_join/send_wallpaper 	| {"url":"http://www.planwallpaper.com/static/images/ZhGEqAP.jpg"} 	|
+| joaoapps_join/send_file      	| {"url":"http://download.thinkbroadband.com/5MB.zip"}             	|
+
diff --git a/source/_components/notify.joaoapps_join.markdown b/source/_components/notify.joaoapps_join.markdown
new file mode 100644
index 00000000000..46e3c5e3701
--- /dev/null
+++ b/source/_components/notify.joaoapps_join.markdown
@@ -0,0 +1,16 @@
+---
+layout: page
+title: "Join Notify"
+description: "Instructions how to setup the Join notification platform within Home Assistant."
+date: 2016-07-12 09:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: joaoapps_join.png
+ha_category: Notify
+ha_release: "0.24"
+---
+
+See the [Joaoapps Join component page](/components/joaoapps/) for information how to get the join notify platform running.
+
diff --git a/source/images/supported_brands/joaoapps_join.png b/source/images/supported_brands/joaoapps_join.png
new file mode 100644
index 00000000000..28fa7c48b29
Binary files /dev/null and b/source/images/supported_brands/joaoapps_join.png differ