diff --git a/homeassistant/components/rollershutter/zwave.py b/homeassistant/components/rollershutter/zwave.py
index ea0be0ddf74..81b891d7bf1 100644
--- a/homeassistant/components/rollershutter/zwave.py
+++ b/homeassistant/components/rollershutter/zwave.py
@@ -60,11 +60,11 @@ class ZwaveRollershutter(zwave.ZWaveDeviceEntity, RollershutterDevice):
 
     def move_up(self, **kwargs):
         """Move the roller shutter up."""
-        self._node.set_dimmer(self._value.value_id, 0)
+        self._node.set_dimmer(self._value.value_id, 100)
 
     def move_down(self, **kwargs):
         """Move the roller shutter down."""
-        self._node.set_dimmer(self._value.value_id, 100)
+        self._node.set_dimmer(self._value.value_id, 0)
 
     def stop(self, **kwargs):
         """Stop the roller shutter."""
diff --git a/homeassistant/components/zwave.py b/homeassistant/components/zwave.py
index 98a24240a00..84ec3dfd847 100644
--- a/homeassistant/components/zwave.py
+++ b/homeassistant/components/zwave.py
@@ -108,7 +108,8 @@ DISCOVERY_COMPONENTS = [
      TYPE_BOOL,
      GENRE_USER),
     ('binary_sensor',
-     [GENERIC_COMMAND_CLASS_BINARY_SENSOR],
+     [GENERIC_COMMAND_CLASS_BINARY_SENSOR,
+      GENERIC_COMMAND_CLASS_MULTILEVEL_SENSOR],
      [SPECIFIC_DEVICE_CLASS_WHATEVER],
      [COMMAND_CLASS_SENSOR_BINARY],
      TYPE_BOOL,