diff --git a/homeassistant/components/device_tracker/__init__.py b/homeassistant/components/device_tracker/__init__.py
index 452480b12c9..e529327f505 100644
--- a/homeassistant/components/device_tracker/__init__.py
+++ b/homeassistant/components/device_tracker/__init__.py
@@ -66,14 +66,15 @@ def setup(hass, config):
         'device_tracker.{}'.format(tracker_type))
 
     if tracker_implementation is None:
-        _LOGGER.error("Unknown device_tracker type specified.")
+        _LOGGER.error("Unknown device_tracker type specified: %s.",
+                      tracker_type)
 
         return False
 
     device_scanner = tracker_implementation.get_scanner(hass, config)
 
     if device_scanner is None:
-        _LOGGER.error("Failed to initialize device scanner for %s",
+        _LOGGER.error("Failed to initialize device scanner: %s",
                       tracker_type)
 
         return False
diff --git a/homeassistant/components/device_tracker/netgear.py b/homeassistant/components/device_tracker/netgear.py
index 3fe11f99fe6..269b6eb1eab 100644
--- a/homeassistant/components/device_tracker/netgear.py
+++ b/homeassistant/components/device_tracker/netgear.py
@@ -35,7 +35,6 @@ from datetime import timedelta
 import threading
 
 from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
-from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle
 from homeassistant.components.device_tracker import DOMAIN
 
@@ -43,20 +42,21 @@ from homeassistant.components.device_tracker import DOMAIN
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)
 
 _LOGGER = logging.getLogger(__name__)
-REQUIREMENTS = ['pynetgear>=0.1']
+REQUIREMENTS = ['pynetgear>=0.3']
 
 
 def get_scanner(hass, config):
     """ Validates config and returns a Netgear scanner. """
-    if not validate_config(config,
-                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
-                           _LOGGER):
+    info = config[DOMAIN]
+    host = info.get(CONF_HOST)
+    username = info.get(CONF_USERNAME)
+    password = info.get(CONF_PASSWORD)
+
+    if password is not None and host is None:
+        _LOGGER.warning('Found username or password but no host')
         return None
 
-    info = config[DOMAIN]
-
-    scanner = NetgearDeviceScanner(
-        info[CONF_HOST], info[CONF_USERNAME], info[CONF_PASSWORD])
+    scanner = NetgearDeviceScanner(host, password, username)
 
     return scanner if scanner.success_init else None
 
@@ -68,16 +68,24 @@ class NetgearDeviceScanner(object):
         import pynetgear
 
         self.last_results = []
-
-        self._api = pynetgear.Netgear(host, username, password)
         self.lock = threading.Lock()
 
+        if host is None:
+            print("BIER")
+            self._api = pynetgear.Netgear()
+        elif username is None:
+            self._api = pynetgear.Netgear(password, host)
+        else:
+            self._api = pynetgear.Netgear(password, host, username)
+
         _LOGGER.info("Logging in")
 
-        self.success_init = self._api.login()
+        results = self._api.get_attached_devices()
+
+        self.success_init = results is not None
 
         if self.success_init:
-            self._update_info()
+            self.last_results = results
         else:
             _LOGGER.error("Failed to Login")
 
diff --git a/homeassistant/components/discovery.py b/homeassistant/components/discovery.py
index cb2e2d3c780..4ad0299cc8f 100644
--- a/homeassistant/components/discovery.py
+++ b/homeassistant/components/discovery.py
@@ -28,11 +28,13 @@ SCAN_INTERVAL = 300  # seconds
 SERVICE_WEMO = 'belkin_wemo'
 SERVICE_HUE = 'philips_hue'
 SERVICE_CAST = 'google_cast'
+SERVICE_NETGEAR = 'netgear_router'
 
 SERVICE_HANDLERS = {
     SERVICE_WEMO: "switch",
     SERVICE_CAST: "media_player",
     SERVICE_HUE: "light",
+    SERVICE_NETGEAR: 'device_tracker',
 }
 
 
@@ -77,6 +79,13 @@ def setup(hass, config):
             if not component:
                 return
 
+            # Hack - fix when device_tracker supports discovery
+            if service == SERVICE_NETGEAR:
+                bootstrap.setup_component(hass, component, {
+                    'device_tracker': {'platform': 'netgear'}
+                })
+                return
+
             # This component cannot be setup.
             if not bootstrap.setup_component(hass, component, config):
                 return
diff --git a/requirements.txt b/requirements.txt
index 20d1d72b47c..e284cad72b9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -81,7 +81,7 @@ https://github.com/Danielhiversen/pyRFXtrx/archive/master.zip
 https://github.com/theolind/pymysensors/archive/master.zip#egg=pymysensors-0.1
 
 # Netgear (device_tracker.netgear)
-pynetgear>=0.1
+pynetgear>=0.3
 
 # Netdisco (discovery)
 netdisco>=0.3