diff --git a/homeassistant/components/binary_sensor/xiaomi_aqara.py b/homeassistant/components/binary_sensor/xiaomi_aqara.py
index 72a4cfdfbaaa8b..ebdcdc6ca70a20 100644
--- a/homeassistant/components/binary_sensor/xiaomi_aqara.py
+++ b/homeassistant/components/binary_sensor/xiaomi_aqara.py
@@ -43,10 +43,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                     data_key = 'channel_0'
                 devices.append(XiaomiButton(device, 'Switch', data_key,
                                             hass, gateway))
-            elif model in ['86sw1', 'sensor_86sw1.aq1']:
+            elif model in ['86sw1', 'sensor_86sw1', 'sensor_86sw1.aq1']:
                 devices.append(XiaomiButton(device, 'Wall Switch', 'channel_0',
                                             hass, gateway))
-            elif model in ['86sw2', 'sensor_86sw2.aq1']:
+            elif model in ['86sw2', 'sensor_86sw2', 'sensor_86sw2.aq1']:
                 devices.append(XiaomiButton(device, 'Wall Switch (Left)',
                                             'channel_0', hass, gateway))
                 devices.append(XiaomiButton(device, 'Wall Switch (Right)',
diff --git a/homeassistant/components/xiaomi_aqara.py b/homeassistant/components/xiaomi_aqara.py
index ae3a4e0be72328..2090f5227093dc 100644
--- a/homeassistant/components/xiaomi_aqara.py
+++ b/homeassistant/components/xiaomi_aqara.py
@@ -23,7 +23,7 @@
 from homeassistant.util.dt import utcnow
 from homeassistant.util import slugify
 
-REQUIREMENTS = ['PyXiaomiGateway==0.9.4']
+REQUIREMENTS = ['PyXiaomiGateway==0.9.5']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index fd2bb5b4f5a1e5..045968c4f209de 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -46,7 +46,7 @@ PyMVGLive==1.1.4
 PyMata==2.14
 
 # homeassistant.components.xiaomi_aqara
-PyXiaomiGateway==0.9.4
+PyXiaomiGateway==0.9.5
 
 # homeassistant.components.rpi_gpio
 # RPi.GPIO==0.6.1