diff --git a/homeassistant/components/zwave/discovery_schemas.py b/homeassistant/components/zwave/discovery_schemas.py
index 19f428484f8..d38fbc7079c 100644
--- a/homeassistant/components/zwave/discovery_schemas.py
+++ b/homeassistant/components/zwave/discovery_schemas.py
@@ -16,6 +16,7 @@ DEFAULT_VALUES_SCHEMA = {
 DISCOVERY_SCHEMAS = [
     {const.DISC_COMPONENT: 'binary_sensor',
      const.DISC_GENERIC_DEVICE_CLASS: [
+         const.GENERIC_TYPE_ENTRY_CONTROL,
          const.GENERIC_TYPE_SENSOR_ALARM,
          const.GENERIC_TYPE_SENSOR_BINARY,
          const.GENERIC_TYPE_SWITCH_BINARY,
@@ -173,7 +174,8 @@ DISCOVERY_SCHEMAS = [
      const.DISC_GENERIC_DEVICE_CLASS: [const.GENERIC_TYPE_ENTRY_CONTROL],
      const.DISC_SPECIFIC_DEVICE_CLASS: [
          const.SPECIFIC_TYPE_ADVANCED_DOOR_LOCK,
-         const.SPECIFIC_TYPE_SECURE_KEYPAD_DOOR_LOCK],
+         const.SPECIFIC_TYPE_SECURE_KEYPAD_DOOR_LOCK,
+         const.SPECIFIC_TYPE_SECURE_LOCKBOX],
      const.DISC_VALUES: dict(DEFAULT_VALUES_SCHEMA, **{
          const.DISC_PRIMARY: {
              const.DISC_COMMAND_CLASS: [const.COMMAND_CLASS_DOOR_LOCK],