diff --git a/climate.yaml b/climate.yaml
index 4b403973..9c44b6f8 100644
--- a/climate.yaml
+++ b/climate.yaml
@@ -4,4 +4,12 @@
   mac: !secret bad_thermostat_mac
   target_temp_default: 20
   target_temp_step: 0.5
+  scan_interval: 15
+
+- platform: broadlinkHysen
+  name: Wohnzimmer Thermostat
+  host: !secret livingroom_thermostat_ip
+  mac: !secret livingroom_thermostat_mac
+  target_temp_default: 20
+  target_temp_step: 0.5
   scan_interval: 15
\ No newline at end of file
diff --git a/group.yaml b/group.yaml
index 1f3a3bb1..f88c5048 100644
--- a/group.yaml
+++ b/group.yaml
@@ -594,8 +594,7 @@ heating:
   name: Thermostate
   entities:
     - climate.bad_thermostat
-    - sensor.bad_thermostat_heating_state
-    - sensor.bad_thermostat_auto_override
+    - climate.wohnzimmer_thermostat
 #################################################################
 ## Synonym
 #################################################################
diff --git a/travis_secrets.yaml b/travis_secrets.yaml
index abe3cef1..c021b0cd 100644
--- a/travis_secrets.yaml
+++ b/travis_secrets.yaml
@@ -132,3 +132,6 @@ snowie_map_url: http://192.168.0.20{{states.sensor.snowie_map.state | string }}
 
 bad_thermostat_ip: 192.168.0.20
 bad_thermostat_mac: "45:F7:24:89:03:A3"
+
+livingroom_thermostat_ip: 192.168.0.21
+livingroom_thermostat_mac: "45:F7:24:89:03:A3"