diff --git a/homeassistant/components/garage_door/zwave.py b/homeassistant/components/garage_door/zwave.py
index e8aacf0b6ad..8ef0fcbed63 100644
--- a/homeassistant/components/garage_door/zwave.py
+++ b/homeassistant/components/garage_door/zwave.py
@@ -13,7 +13,7 @@ from homeassistant.components import zwave
 from homeassistant.components.garage_door import GarageDoorDevice
 
 COMMAND_CLASS_SWITCH_BINARY = 0x25  # 37
-
+COMMAND_CLASS_BARRIER_OPERATOR = 0x66  # 102
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -25,7 +25,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]]
     value = node.values[discovery_info[zwave.ATTR_VALUE_ID]]
 
-    if value.command_class != zwave.COMMAND_CLASS_SWITCH_BINARY:
+    if value.command_class != zwave.COMMAND_CLASS_SWITCH_BINARY and \
+       value.command_class != zwave.COMMAND_CLASS_BARRIER_OPERATOR:
         return
     if value.type != zwave.TYPE_BOOL:
         return
@@ -62,8 +63,8 @@ class ZwaveGarageDoor(zwave.ZWaveDeviceEntity, GarageDoorDevice):
 
     def close_door(self):
         """Close the garage door."""
-        self._value.node.set_switch(self._value.value_id, False)
+        self._value.data = False
 
     def open_door(self):
         """Open the garage door."""
-        self._value.node.set_switch(self._value.value_id, True)
+        self._value.data = True
diff --git a/homeassistant/components/zwave.py b/homeassistant/components/zwave.py
index e280f5adcf9..a26ccb7ecd3 100644
--- a/homeassistant/components/zwave.py
+++ b/homeassistant/components/zwave.py
@@ -51,6 +51,7 @@ COMMAND_CLASS_SWITCH_MULTILEVEL = 38
 COMMAND_CLASS_DOOR_LOCK = 98
 COMMAND_CLASS_THERMOSTAT_SETPOINT = 67
 COMMAND_CLASS_THERMOSTAT_FAN_MODE = 68
+COMMAND_CLASS_BARRIER_OPERATOR = 102
 COMMAND_CLASS_BATTERY = 128
 COMMAND_CLASS_SENSOR_ALARM = 156
 
@@ -173,7 +174,8 @@ DISCOVERY_COMPONENTS = [
      [GENERIC_COMMAND_CLASS_ENTRY_CONTROL],
      [SPECIFIC_DEVICE_CLASS_SECURE_BARRIER_ADD_ON,
       SPECIFIC_DEVICE_CLASS_SECURE_DOOR],
-     [COMMAND_CLASS_SWITCH_BINARY],
+     [COMMAND_CLASS_SWITCH_BINARY,
+      COMMAND_CLASS_BARRIER_OPERATOR],
      TYPE_BOOL,
      GENRE_USER)
 ]