diff --git a/home-assistant/conf_switch.d/sonoff_living.yaml b/home-assistant/conf_switch.d/sonoff_living.yaml
new file mode 100644
index 0000000..6353da6
--- /dev/null
+++ b/home-assistant/conf_switch.d/sonoff_living.yaml
@@ -0,0 +1,8 @@
+- platform: "mqtt"
+  name: "SonOff Living Room"
+  command_topic: "sonoff_living/switch"
+  state_topic: "sonoff_living/status"
+  qos: 0
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
diff --git a/home-assistant/configuration.yaml b/home-assistant/configuration.yaml
new file mode 100644
index 0000000..196b6ee
--- /dev/null
+++ b/home-assistant/configuration.yaml
@@ -0,0 +1,8 @@
+mqtt:
+  broker:    "XXX"
+  port:      1883
+  client_id: "homeassistant1"
+  username:  "XXX"
+  password:  "XXX"
+
+switch: !include_dir_merge_list "conf_switch.d/"