diff --git a/source/_components/binary_sensor.velbus.markdown b/source/_components/binary_sensor.velbus.markdown
new file mode 100644
index 00000000000..bba3618f134
--- /dev/null
+++ b/source/_components/binary_sensor.velbus.markdown
@@ -0,0 +1,42 @@
+---
+layout: page
+title: "Velbus sensors"
+description: "Access and control your Velbus sensors."
+date: 2017-06-17 16.58
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: velbus.png
+ha_category: Binary Sensor
+ha_iot_class: "Local Push"
+ha_release: 0.49
+---
+
+The `velbus` binary_sensor allows you to control [Velbus](http://www.velbus.eu) connected wall switches.
+
+To use your Velbus wall switches in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+
+binary_sensor:
+  - platform: velbus
+    devices:
+       - name: Wall Switch 1
+         module: 0xda
+         channel: 4
+       - name: Wall Switch 2
+         module: 0xbc
+         channel: 1
+         is_pushbutton: true
+```
+
+Configuration variables:
+- **devices** array (*Required*): The array contains the binary sensors to configure
+  - **name** (*Required*): Name of the binary sensor.
+  - **module** (*Required*): The hexadecimal module address
+  - **channel** (*Required*): The channel number in the module.
+  - **is_pushbutton** (*Optional*): Booelan to indicate if a wall switch is a push button or not (default: false)
+
+For hub configuration, see [the Velbus component](/components/velbus/).
diff --git a/source/_components/fan.velbus.markdown b/source/_components/fan.velbus.markdown
new file mode 100644
index 00000000000..f9008b7275c
--- /dev/null
+++ b/source/_components/fan.velbus.markdown
@@ -0,0 +1,41 @@
+---
+layout: page
+title: "Velbus Fans"
+description: "Access and control your Velbus fans."
+date: 2017-06-17 16.58
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: velbus.png
+ha_category: Fan
+ha_iot_class: "Local Push"
+ha_release: 0.49
+---
+
+The `velbus` fan allows you to control [Velbus](http://www.velbus.eu) connected fans.
+
+To use your Velbus fans in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+
+fan:
+  - platform: velbus
+    devices:
+       - name: Fan 1
+         module: 0xda
+         channel_low: 4
+         channel_medium: 3
+         channel_high: 2
+```
+
+Configuration variables:
+- **devices** array (*Required*): The array contains the fans to configure
+  - **name** (*Required*): Name of the fan.
+  - **module** (*Required*): The hexadecimal module address
+  - **channel_low** (*Required*): The channel number in the module for low-speed.
+  - **channel_medium** (*Required*): The channel number in the module for medium-speed.
+  - **channel_high** (*Required*): The channel number in the module for high-speed.
+
+For hub configuration, see [the Velbus component](/components/velbus/).
diff --git a/source/_components/light.velbus.markdown b/source/_components/light.velbus.markdown
new file mode 100644
index 00000000000..ba0f09cb204
--- /dev/null
+++ b/source/_components/light.velbus.markdown
@@ -0,0 +1,40 @@
+---
+layout: page
+title: "Velbus lights"
+description: "Access and control your Velbus lights."
+date: 2017-06-17 16.58
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: velbus.png
+ha_category: Light
+ha_iot_class: "Local Push"
+ha_release: 0.49
+---
+
+The `velbus` light allows you to control [Velbus](http://www.velbus.eu) lights.
+
+To use your Velbus lights in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+
+light:
+  - platform: velbus
+    devices:
+       - name: Light 1
+         module: 0xda
+         channel: 4
+       - name: Light 2
+         module: 0xbc
+         channel: 1
+```
+
+Configuration variables:
+- **devices** array (*Required*): The array contains the lights to configure
+  - **name** (*Required*): Name of the light.
+  - **module** (*Required*): The hexadecimal module address
+  - **channel** (*Required*): The channel number in the module.
+
+For hub configuration, see [the Velbus component](/components/velbus/).
diff --git a/source/_components/switch.velbus.markdown b/source/_components/switch.velbus.markdown
new file mode 100644
index 00000000000..216970bb2fa
--- /dev/null
+++ b/source/_components/switch.velbus.markdown
@@ -0,0 +1,44 @@
+---
+layout: page
+title: "Velbus Switches"
+description: "Access and control your Velbus Switches."
+date: 2017-06-17 16.58
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: velbus.png
+ha_category: Switch
+ha_iot_class: "Local Push"
+ha_release: 0.49
+---
+
+The `velbus` switch allows you to control [Velbus](http://www.velbus.eu) connected switches.
+
+To use your Velbus switches in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+
+light:
+  - platform: velbus
+    devices:
+       - name: Switch 1
+         type: single
+         module: 0xda
+         channel: 4
+       - name: Switch 2
+         type: double
+         module: 0xbc
+         open_channel: 1
+         close_channel: 2
+```
+
+Configuration variables:
+- **devices** array (*Required*): The array contains the switches to configure
+  - **name** (*Required*): Name of the switch.
+  - **module** (*Required*): The hexadecimal module address
+  - **type** (*Required*): Either `single` or `double`. If single, only `channel` attribute is required. If double, both `open_channel` and `close_channel` attributes are required
+  - **channel** (*Required*): The channel number in the module.
+
+For hub configuration, see [the Velbus component](/components/velbus/).
diff --git a/source/_components/velbus.markdown b/source/_components/velbus.markdown
new file mode 100644
index 00000000000..865d052973d
--- /dev/null
+++ b/source/_components/velbus.markdown
@@ -0,0 +1,25 @@
+---
+layout: page
+title: "Velbus"
+description: "Access and control your Velbus devices."
+date: 2017-06-17 16.58
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: velbus.png
+ha_category: Hub
+ha_iot_class: "Local Push"
+ha_release: 0.49
+---
+
+The `velbus` component supports the Velbus USB and Serial gateways.
+
+The gateway needs to be configured by adding the following lines to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+
+velbus:
+  port: '/dev/ttyUSB00'
+```
diff --git a/source/images/supported_brands/velbus.png b/source/images/supported_brands/velbus.png
new file mode 100644
index 00000000000..da459dbfe8e
Binary files /dev/null and b/source/images/supported_brands/velbus.png differ