diff --git a/homeassistant/components/default_config/__init__.py b/homeassistant/components/default_config/__init__.py
index badc403c7c8..888a4d51c95 100644
--- a/homeassistant/components/default_config/__init__.py
+++ b/homeassistant/components/default_config/__init__.py
@@ -6,7 +6,6 @@ DEPENDENCIES = (
     'cloud',
     'config',
     'conversation',
-    'discovery',
     'frontend',
     'history',
     'logbook',
@@ -17,6 +16,7 @@ DEPENDENCIES = (
     'sun',
     'system_health',
     'updater',
+    'zeroconf',
 )
 
 
diff --git a/homeassistant/config.py b/homeassistant/config.py
index db59e2c2744..19b8087e538 100644
--- a/homeassistant/config.py
+++ b/homeassistant/config.py
@@ -75,6 +75,9 @@ introduction:
 # http:
 #   base_url: example.duckdns.org:8123
 
+# Discover some devices automatically
+discovery:
+
 # Sensors
 sensor:
   # Weather prediction