diff --git a/source/_components/bbb_gpio.markdown b/source/_components/bbb_gpio.markdown
new file mode 100644
index 000000000000..96ee54010ee8
--- /dev/null
+++ b/source/_components/bbb_gpio.markdown
@@ -0,0 +1,16 @@
+---
+layout: page
+title: "BeagleBone Black GPIO"
+description: "Instructions how to integrate the GPIO capability of a BeagleBone Black into Home Assistant."
+date: 2017-01-14 10:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: beaglebone-black.png
+ha_category: DIY
+ha_release: 0.36
+---
+
+The `bbb_gpio` component is the base for all [BeagleBone Black][https://beagleboard.org/black] related GPIO platforms in Home Assistant. There is no setup needed for the component itself, for the platforms please check their corresponding pages.
+
diff --git a/source/_components/sensor.usps.markdown b/source/_components/sensor.usps.markdown
index 0ef96a5c84cb..fe81ff01c5ad 100644
--- a/source/_components/sensor.usps.markdown
+++ b/source/_components/sensor.usps.markdown
@@ -12,7 +12,7 @@ ha_category: Sensor
 ha_release: 0.36
 ---
 
-The `usps` platform allows one to track [US POstal Service (USPS)](https://www.usps.com/).
+The `usps` platform allows one to track deliveries by the [US Postal Service (USPS)](https://www.usps.com/).
 
 To enable this sensor, add the following lines to your `configuration.yaml`:
 
diff --git a/source/_components/switch.bbb_gpio.markdown b/source/_components/switch.bbb_gpio.markdown
new file mode 100644
index 000000000000..e03354ef118f
--- /dev/null
+++ b/source/_components/switch.bbb_gpio.markdown
@@ -0,0 +1,41 @@
+---
+layout: page
+title: "BeagleBone Black GPIO Switch"
+description: "Instructions how to integrate the GPIO of a BeagleBone Black into Home Assistant as a switch."
+date: 2017-01-14 10:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: beaglebone-black.png
+ha_category: Switch
+ha_release: 0.36
+---
+
+The `bbb_gpio` switch platform allows you to control the GPIOs of your [BeagleBone Black](https://beagleboard.org/black).
+
+To use yourBeagleBone Black's GPIO in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+ - platform: bbb_gpio
+   pins:
+     GPIO0_7:
+       name: LED Red
+     P9_12:
+       name: LED Green
+       initial: true
+       invert_logic: true
+```
+
+Configuration variables:
+
+- **pins** array (*Required*): Array of used ports.
+  - **pin_name** (*Required*): Port numbers and corresponding names.
+    - **name** (*Optional*): Friendly name to use for the frontend.
+    - **initial** (*Optional*): Initial state of the pin. Defaults to `False`.
+    - **invert_logic** (*Optional*): If true, inverts the output logic to ACTIVE LOW. Default is `false` (ACTIVE HIGH).
+
+For more details about the GPIO layout, visit the [article](http://elinux.org/Beagleboard:BeagleBoneBlack) about the BeagleBone Black.
+
diff --git a/source/images/supported_brands/beaglebone-black.png b/source/images/supported_brands/beaglebone-black.png
new file mode 100644
index 000000000000..7613a4011e71
Binary files /dev/null and b/source/images/supported_brands/beaglebone-black.png differ