diff --git a/homeassistant/components/device_tracker/__init__.py b/homeassistant/components/device_tracker/__init__.py
index 4247213087b..236fde6fb3f 100644
--- a/homeassistant/components/device_tracker/__init__.py
+++ b/homeassistant/components/device_tracker/__init__.py
@@ -338,7 +338,7 @@ class Device(Entity):
             attr[ATTR_BATTERY] = self.battery
 
         if self.attributes:
-            for key, value in self.attributes:
+            for key, value in self.attributes.items():
                 attr[key] = value
 
         return attr
diff --git a/homeassistant/components/device_tracker/automatic.py b/homeassistant/components/device_tracker/automatic.py
index 927c515b3a5..7855323ba06 100644
--- a/homeassistant/components/device_tracker/automatic.py
+++ b/homeassistant/components/device_tracker/automatic.py
@@ -142,6 +142,7 @@ class AutomaticDeviceScanner(object):
 
         for vehicle in self.last_results:
             dev_id = vehicle.get('id')
+            host_name = vehicle.get('display_name')
 
             attrs = {
                 'fuel_level': vehicle.get('fuel_level_percent')
@@ -149,6 +150,7 @@ class AutomaticDeviceScanner(object):
 
             kwargs = {
                 'dev_id': dev_id,
+                'host_name': host_name,
                 'mac': dev_id,
                 ATTR_ATTRIBUTES: attrs
             }