diff --git a/homeassistant/components/hvac/zwave.py b/homeassistant/components/hvac/zwave.py
index 2a9c0726f92..63a8487de97 100755
--- a/homeassistant/components/hvac/zwave.py
+++ b/homeassistant/components/hvac/zwave.py
@@ -135,7 +135,7 @@ class ZWaveHvac(ZWaveDeviceEntity, HvacDevice):
                     class_id=COMMAND_CLASS_CONFIGURATION).values():
                 if value.command_class == 112 and value.index == 33:
                     self._current_swing_mode = value.data
-                    self._swing_list = [0, 1]
+                    self._swing_list = list(value.data_items)
                     _LOGGER.debug("self._swing_list=%s", self._swing_list)
 
     @property
@@ -235,5 +235,5 @@ class ZWaveHvac(ZWaveDeviceEntity, HvacDevice):
             for value in self._node.get_values(
                     class_id=COMMAND_CLASS_CONFIGURATION).values():
                 if value.command_class == 112 and value.index == 33:
-                    value.data = int(swing_mode)
+                    value.data = bytes(swing_mode, 'utf-8')
                     break