diff --git a/source/_components/binary_sensor.knx.markdown b/source/_components/binary_sensor.knx.markdown
new file mode 100644
index 00000000000..f9af2538a4a
--- /dev/null
+++ b/source/_components/binary_sensor.knx.markdown
@@ -0,0 +1,15 @@
+---
+layout: page
+title: "KNX Binary Sensor"
+description: "Instructions how to setup the KNX binary sensors within Home Assistant."
+date: 2016-07-13 07:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: zknx.png
+ha_category: Binary Sensor
+ha_release: 0.24
+---
+
+To get your KNX binary sensors working with Home Assistant, follow the instructions for the [KNX component](/components/knx/).
diff --git a/source/_components/switch.knx.markdown b/source/_components/switch.knx.markdown
new file mode 100644
index 00000000000..d90f21ccb06
--- /dev/null
+++ b/source/_components/switch.knx.markdown
@@ -0,0 +1,15 @@
+---
+layout: page
+title: "KNX Switch"
+description: "Instructions how to setup the KNX switches within Home Assistant."
+date: 2016-07-13 07:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: zknx.png
+ha_category: Switch
+ha_release: 0.24
+---
+
+To get your KNX switches working with Home Assistant, follow the instructions for the [KNX component](/components/knx/).