diff --git a/test/test-discovery b/test/test-discovery
index 94eafe4..32e780e 100755
--- a/test/test-discovery
+++ b/test/test-discovery
@@ -8,31 +8,31 @@ import dbus
 import dbus.mainloop.glib
 from optparse import OptionParser, make_option
 
-compact = False;
-addresses = [];
+compact = False
+devices = {}
 
 def print_compact(address, properties):
-	if address in addresses:
-		return
-
-	addresses.append(address)
-
 	name = ""
+	address = "<unknown>"
 
-	for key in properties.keys():
-		value = properties[key]
+	for key, value in properties.iteritems():
 		if type(value) is dbus.String:
 			value = unicode(value).encode('ascii', 'replace')
 		if (key == "Name"):
 			name = value
+		elif (key == "Address"):
+			address = value
 
-	print("%s  %s" % (address, name))
+	if "Logged" in properties:
+		flag = "*"
+	else:
+		flag = " "
 
-def device_found(address, properties):
-	if compact:
-		print_compact(address, properties)
-		return
+	print("%s%s %s" % (flag, address, name))
+
+	properties["Logged"] = True
 
+def print_normal(address, properties):
 	print("[ " + address + " ]")
 
 	for key in properties.keys():
@@ -46,6 +46,64 @@ def device_found(address, properties):
 
 	print()
 
+	properties["Logged"] = True
+
+def skip_dev(old_dev, new_dev):
+	if not "Logged" in old_dev:
+		return False
+	if "Name" in old_dev:
+		return True
+	if not "Name" in new_dev:
+		return True
+	return False
+
+def interfaces_added(path, interfaces):
+	properties = interfaces["org.bluez.Device"]
+	if not properties:
+		return
+
+	if path in devices:
+		dev = devices[path]
+
+		if compact and skip_dev(dev, properties):
+			return
+		devices[path] = dict(devices[path].items() + properties.items())
+	else:
+		devices[path] = properties
+
+	if "Address" in devices[path]:
+		address = properties["Address"]
+	else:
+		address = "<unknown>"
+
+	if compact:
+		print_compact(address, devices[path])
+	else:
+		print_normal(address, devices[path])
+
+def properties_changed(interface, changed, invalidated, path):
+	if interface != "org.bluez.Device":
+		return
+
+	if path in devices:
+		dev = devices[path]
+
+		if compact and skip_dev(dev, changed):
+			return
+		devices[path] = dict(devices[path].items() + changed.items())
+	else:
+		devices[path] = changed
+
+	if "Address" in devices[path]:
+		address = devices[path]["Address"]
+	else:
+		address = "<unknown>"
+
+	if compact:
+		print_compact(address, devices[path])
+	else:
+		print_normal(address, devices[path])
+
 def property_changed(name, value):
 	if (name == "Discovering" and not value):
 		mainloop.quit()
@@ -78,14 +136,27 @@ if __name__ == '__main__':
 	adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
 							"org.bluez.Adapter")
 
-	bus.add_signal_receiver(device_found,
-			dbus_interface = "org.bluez.Adapter",
-					signal_name = "DeviceFound")
+	bus.add_signal_receiver(interfaces_added,
+			dbus_interface = "org.freedesktop.DBus.ObjectManager",
+			signal_name = "InterfacesAdded")
+
+	bus.add_signal_receiver(properties_changed,
+			dbus_interface = "org.freedesktop.DBus.Properties",
+			signal_name = "PropertiesChanged",
+			arg0 = "org.bluez.Device",
+			path_keyword = "path")
 
 	bus.add_signal_receiver(property_changed,
-			dbus_interface = "org.bluez.Adapter",
+					dbus_interface = "org.bluez.Adapter",
 					signal_name = "PropertyChanged")
 
+	om = dbus.Interface(bus.get_object("org.bluez", "/"),
+				"org.freedesktop.DBus.ObjectManager")
+	objects = om.GetManagedObjects()
+	for path, interfaces in objects.iteritems():
+		if "org.bluez.Device" in interfaces:
+			devices[path] = interfaces["org.bluez.Device"]
+
 	adapter.StartDiscovery()
 
 	mainloop = GObject.MainLoop()