diff --git a/homeassistant/components/discovery/__init__.py b/homeassistant/components/discovery/__init__.py
index 2765757d737..229e64ad682 100644
--- a/homeassistant/components/discovery/__init__.py
+++ b/homeassistant/components/discovery/__init__.py
@@ -48,7 +48,6 @@ SERVICE_XIAOMI_GW = 'xiaomi_gw'
 CONFIG_ENTRY_HANDLERS = {
     SERVICE_DAIKIN: 'daikin',
     SERVICE_TELLDUSLIVE: 'tellduslive',
-    'sonos': 'sonos',
     SERVICE_IGD: 'upnp',
 }
 
@@ -100,6 +99,7 @@ MIGRATED_SERVICE_HANDLERS = [
     'homekit',
     'ikea_tradfri',
     'philips_hue',
+    'sonos',
     SERVICE_WEMO,
 ]
 
diff --git a/homeassistant/components/sonos/manifest.json b/homeassistant/components/sonos/manifest.json
index b1f4c924fc4..8a7dd60d80a 100644
--- a/homeassistant/components/sonos/manifest.json
+++ b/homeassistant/components/sonos/manifest.json
@@ -7,6 +7,11 @@
     "pysonos==0.0.14"
   ],
   "dependencies": [],
+  "ssdp": {
+    "st": [
+      "urn:schemas-upnp-org:device:ZonePlayer:1"
+    ]
+  },
   "codeowners": [
     "@amelchio"
   ]
diff --git a/homeassistant/generated/ssdp.py b/homeassistant/generated/ssdp.py
index 62273bf303b..28df05a872c 100644
--- a/homeassistant/generated/ssdp.py
+++ b/homeassistant/generated/ssdp.py
@@ -18,6 +18,9 @@ SSDP = {
     "st": {
         "urn:schemas-denon-com:device:ACT-Denon:1": [
             "heos"
+        ],
+        "urn:schemas-upnp-org:device:ZonePlayer:1": [
+            "sonos"
         ]
     }
 }