diff --git a/source/_components/binary_sensor.iss.markdown b/source/_components/binary_sensor.iss.markdown
new file mode 100644
index 00000000000..616a44b04f9
--- /dev/null
+++ b/source/_components/binary_sensor.iss.markdown
@@ -0,0 +1,29 @@
+---
+layout: page
+title: "International Space Station"
+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: nasa.png
+ha_category: Binary 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 to see the timestamp for the next rise of the station, its current coordinates, and the number of people in space.
+
+To add ISS binary sensor to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+binary_sensor:
+  - platform: iss
+```
+
+Configuration variables:
+
+- **show_on_map** (*Optional*): Option to show the position of the ISS on the map. Defaults to `False`.
diff --git a/source/_components/sensor.iss.markdown b/source/_components/sensor.iss.markdown
index 5e44a1b63c4..ca2ee55b23e 100644
--- a/source/_components/sensor.iss.markdown
+++ b/source/_components/sensor.iss.markdown
@@ -7,11 +7,15 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-logo: bbox.png
-ha_category: Sensor
+logo: nasa.png
+ha_category: Deprecated
 ha_release: 0.36
 ---
 
+<p class='note warning'>
+**This platform has been deprecated in favor of the "[ISS](/components/binary_sensor.iss/)" platform and will be removed in the future. Please use the "iss" binary sensor platform.**
+</p>
+
 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.
 
@@ -22,5 +26,3 @@ To add ISS sensor to your installation, add the following to your `configuration
 sensor:
   - platform: iss
 ```
-
-
diff --git a/source/images/supported_brands/nasa.png b/source/images/supported_brands/nasa.png
new file mode 100644
index 00000000000..640e5cdfb4d
Binary files /dev/null and b/source/images/supported_brands/nasa.png differ