diff --git a/source/_components/mochad.markdown b/source/_components/mochad.markdown
index ab139fd9d08..f27367f0da1 100644
--- a/source/_components/mochad.markdown
+++ b/source/_components/mochad.markdown
@@ -8,25 +8,28 @@ comments: false
 sharing: true
 footer: true
 ha_category: Hub
+ha_release: 0.32
 ---
 
-The Mochad component is the main component to integrate all X10 platforms being
-controlled by [mochad](https://sourceforge.net/projects/mochad/). Besides this component you will have to setup your X10 devices separately.
+The `mochad` component is the main component to integrate all X10 platforms being controlled by [mochad](https://sourceforge.net/projects/mochad/). Besides this component you will have to setup your X10 devices separately.
+
+To integrate your Mochad units with Home Assistant, add the following section to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+mochad:
+```
+
+Configuration variables:
+
+- **host** (*Optional*): The host that mochad is running on. Defaults to `localhost`.
+- **port** (*Optional*): The port that mochad is running on. Defaults to `1099`.
+
+A full configuration sample could look like the one below:
 
 ```yaml
 # Example configuration.yaml entry
 mochad:
   host: localhost
   port: 1099
-
-switch:
-  platform: mochad
-  devices:
-    - name: Light Switch
-      address: a1
 ```
-
-Configuration variables:
-
-- **host** (*Optional*): The host that mochad is running on, defaults to *localhost*
-- **port** (*Optional*): The port that mochad is running on, defaults to *1099*
diff --git a/source/_components/switch.mochad.markdown b/source/_components/switch.mochad.markdown
index 9bea444762b..af7d831d061 100644
--- a/source/_components/switch.mochad.markdown
+++ b/source/_components/switch.mochad.markdown
@@ -9,24 +9,24 @@ sharing: true
 footer: true
 ha_category: Switch
 ha_iot_class: depends
+ha_release: 0.32
 ---
 
 The `mochad` switch platform lets you control an X10 enabled switch device.
 
-To enable this switch in your installation, add the following to your `configuration.yaml` file:
+To enable this sensor, you first have to set up the [mochad component](/components/mochad/) and then add the following to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yml entry
 switch:
   - platform: mochad
     devices:
-      - name: Switch A
-        address: a1
-      - name: Living Room Lamp
-        address: a5
+      - address: a1
+      - address: a5
 ```
 
 Configuration variables:
 
-- **name** (*Optional*): The name of the switch. Default is: x10_switch_dev_*address*
-- **address** (*Required*): The X10 address of the switch
+- **address** (*Required*): The X10 address of the switch.
+- **name** (*Optional*): The name of the switch. Default is: x10_switch_dev_*address*.
+