diff --git a/source/_components/binary_sensor.tapsaff.markdown b/source/_components/binary_sensor.tapsaff.markdown
new file mode 100644
index 000000000000..b8e8636af66a
--- /dev/null
+++ b/source/_components/binary_sensor.tapsaff.markdown
@@ -0,0 +1,32 @@
+---
+layout: page
+title: "Taps Aff"
+description: "Instructions how to use the Taps Aff binary sensor in Home Assistant."
+date: 2017-05-28 18:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: tapsaff.png
+ha_category: Weather
+featured: false
+ha_release: 0.47
+ha_iot_class: "Local Polling"
+---
+
+
+The `tapsaff` binary sensor provides the 'Taps Aff' status for a given location within the UK using [Taps Aff](http://www.taps-aff.co.uk). 
+
+To enable this sensor, add the following lines to your `configuration.yaml`:
+
+```yaml
+# Example configuration.yaml entry
+binary_sensor:
+  - platform: tapsaff
+    location: glasgow
+```
+
+Configuration variables:
+
+- **location** (*Required*): The location for the Taps Aff. It must be configured with a UK postcode or city to work. 
+- **name** (*Optional*): The name to use when displaying this sensor.
diff --git a/source/images/supported_brands/tapsaff.png b/source/images/supported_brands/tapsaff.png
new file mode 100644
index 000000000000..e7af2873f381
Binary files /dev/null and b/source/images/supported_brands/tapsaff.png differ