diff --git a/homeassistant/components/sensor/zwave.py b/homeassistant/components/sensor/zwave.py
index 0d10a470b07..0c4d61d86d2 100644
--- a/homeassistant/components/sensor/zwave.py
+++ b/homeassistant/components/sensor/zwave.py
@@ -18,6 +18,8 @@ _LOGGER = logging.getLogger(__name__)
 def get_device(node, value, **kwargs):
     """Create zwave entity device."""
     # Generic Device mappings
+    if value.command_class == zwave.const.COMMAND_CLASS_BATTERY:
+        return ZWaveSensor(value)
     if node.has_command_class(zwave.const.COMMAND_CLASS_SENSOR_MULTILEVEL):
         return ZWaveMultilevelSensor(value)
     if node.has_command_class(zwave.const.COMMAND_CLASS_METER) and \
diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py
index bd6394867c2..ba7a0f0f033 100755
--- a/homeassistant/components/zwave/__init__.py
+++ b/homeassistant/components/zwave/__init__.py
@@ -70,7 +70,8 @@ DISCOVERY_COMPONENTS = [
      [const.COMMAND_CLASS_SENSOR_MULTILEVEL,
       const.COMMAND_CLASS_METER,
       const.COMMAND_CLASS_ALARM,
-      const.COMMAND_CLASS_SENSOR_ALARM],
+      const.COMMAND_CLASS_SENSOR_ALARM,
+      const.COMMAND_CLASS_BATTERY],
      const.TYPE_WHATEVER,
      const.GENRE_USER),
     ('light',