diff --git a/homeassistant/components/ubee/device_tracker.py b/homeassistant/components/ubee/device_tracker.py
index 8e610a4f51c..b81a2320b5e 100644
--- a/homeassistant/components/ubee/device_tracker.py
+++ b/homeassistant/components/ubee/device_tracker.py
@@ -18,7 +18,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_HOST): cv.string,
     vol.Required(CONF_PASSWORD): cv.string,
     vol.Required(CONF_USERNAME): cv.string,
-    vol.Optional(CONF_MODEL, default=DEFAULT_MODEL): cv.string
+    vol.Optional(CONF_MODEL, default=DEFAULT_MODEL):
+        vol.Any(
+            'EVW32C-0N',
+            'EVW320B',
+            'EVW3200-Wifi',
+            'EVW3226@UPC',
+        ),
 })
 
 
diff --git a/homeassistant/components/ubee/manifest.json b/homeassistant/components/ubee/manifest.json
index 524dcb1d77b..f9f17e41546 100644
--- a/homeassistant/components/ubee/manifest.json
+++ b/homeassistant/components/ubee/manifest.json
@@ -3,7 +3,7 @@
   "name": "Ubee",
   "documentation": "https://www.home-assistant.io/components/ubee",
   "requirements": [
-    "pyubee==0.5"
+    "pyubee==0.6"
   ],
   "dependencies": [],
   "codeowners": []
diff --git a/requirements_all.txt b/requirements_all.txt
index bc48a6538a3..23d0c480074 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1441,7 +1441,7 @@ pytradfri[async]==6.0.1
 pytrafikverket==0.1.5.9
 
 # homeassistant.components.ubee
-pyubee==0.5
+pyubee==0.6
 
 # homeassistant.components.unifi
 pyunifi==2.16