diff --git a/homeassistant/components/binary_sensor/fibaro.py b/homeassistant/components/binary_sensor/fibaro.py
index 124ff88a9a3..ae8029e13f8 100644
--- a/homeassistant/components/binary_sensor/fibaro.py
+++ b/homeassistant/components/binary_sensor/fibaro.py
@@ -16,6 +16,8 @@ DEPENDENCIES = ['fibaro']
 _LOGGER = logging.getLogger(__name__)
 
 SENSOR_TYPES = {
+    'com.fibaro.floodSensor':   ['Flood', 'mdi:water', 'flood'],
+    'com.fibaro.motionSensor':   ['Motion', 'mdi:run', 'motion'],
     'com.fibaro.doorSensor':   ['Door', 'mdi:window-open', 'door'],
     'com.fibaro.windowSensor': ['Window', 'mdi:window-open', 'window'],
     'com.fibaro.smokeSensor': ['Smoke', 'mdi:smoking', 'smoke'],
diff --git a/homeassistant/components/fibaro.py b/homeassistant/components/fibaro.py
index 85bd5c3c018..51d7dd2ef7e 100644
--- a/homeassistant/components/fibaro.py
+++ b/homeassistant/components/fibaro.py
@@ -43,7 +43,8 @@ FIBARO_TYPEMAP = {
     'com.fibaro.smokeSensor': 'binary_sensor',
     'com.fibaro.remoteSwitch': 'switch',
     'com.fibaro.sensor': 'sensor',
-    'com.fibaro.colorController': 'light'
+    'com.fibaro.colorController': 'light',
+    'com.fibaro.securitySensor': 'binary_sensor'
 }
 
 CONFIG_SCHEMA = vol.Schema({