diff --git a/homeassistant/components/sensor/zwave.py b/homeassistant/components/sensor/zwave.py
index 0c93b3d8cf1..0a9b3e8290f 100644
--- a/homeassistant/components/sensor/zwave.py
+++ b/homeassistant/components/sensor/zwave.py
@@ -70,6 +70,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     elif value.command_class == zwave.COMMAND_CLASS_SENSOR_MULTILEVEL:
         add_devices([ZWaveMultilevelSensor(value)])
 
+    elif (value.command_class == zwave.COMMAND_CLASS_METER and
+          value.type == zwave.TYPE_DECIMAL):
+        add_devices([ZWaveMultilevelSensor(value)])
+
 
 class ZWaveSensor(Entity):
     """ Represents a Z-Wave sensor. """
diff --git a/homeassistant/components/zwave.py b/homeassistant/components/zwave.py
index e5b321c989d..69584d93b53 100644
--- a/homeassistant/components/zwave.py
+++ b/homeassistant/components/zwave.py
@@ -27,6 +27,7 @@ DISCOVER_LIGHTS = "zwave.light"
 COMMAND_CLASS_SWITCH_MULTILEVEL = 38
 COMMAND_CLASS_SENSOR_BINARY = 48
 COMMAND_CLASS_SENSOR_MULTILEVEL = 49
+COMMAND_CLASS_METER = 50
 COMMAND_CLASS_BATTERY = 128
 
 GENRE_WHATEVER = None
@@ -35,15 +36,18 @@ GENRE_USER = "User"
 TYPE_WHATEVER = None
 TYPE_BYTE = "Byte"
 TYPE_BOOL = "Bool"
+TYPE_DECIMAL = "Decimal"
 
 # list of tuple (DOMAIN, discovered service, supported command
 # classes, value type)
 DISCOVERY_COMPONENTS = [
     ('sensor',
      DISCOVER_SENSORS,
-     [COMMAND_CLASS_SENSOR_BINARY, COMMAND_CLASS_SENSOR_MULTILEVEL],
+     [COMMAND_CLASS_SENSOR_BINARY,
+      COMMAND_CLASS_SENSOR_MULTILEVEL,
+      COMMAND_CLASS_METER],
      TYPE_WHATEVER,
-     GENRE_WHATEVER),
+     GENRE_USER),
     ('light',
      DISCOVER_LIGHTS,
      [COMMAND_CLASS_SWITCH_MULTILEVEL],