diff --git a/source/_components/sensor.iss.markdown b/source/_components/sensor.iss.markdown
new file mode 100644
index 00000000000..5e44a1b63c4
--- /dev/null
+++ b/source/_components/sensor.iss.markdown
@@ -0,0 +1,26 @@
+---
+layout: page
+title: "International Space Station Sensor"
+description: "Know if or when ISS will be above your home location"
+date: 2016-12-18 10:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: bbox.png
+ha_category: Sensor
+ha_release: 0.36
+---
+
+The `iss` platform uses the [Open Notify API](http://open-notify.org/Open-Notify-API/ISS-Location-Now/) to let you know if the station is above your home location. This means that ISS is 10° above the horizon of your home.
+You can check in the attributes of the sensor how many minutes you have to wait until the next rise of the station and the number of people in space.
+
+To add ISS sensor to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: iss
+```
+
+
diff --git a/source/images/supported_brands/iss.png b/source/images/supported_brands/iss.png
new file mode 100644
index 00000000000..69a167003db
Binary files /dev/null and b/source/images/supported_brands/iss.png differ