diff -Nru NetworkManager-0.7.0.orig/src/nm-hal-manager.c NetworkManager-0.7.0/src/nm-hal-manager.c
--- NetworkManager-0.7.0.orig/src/nm-hal-manager.c	2008-04-29 15:18:16.000000000 -0700
+++ NetworkManager-0.7.0/src/nm-hal-manager.c	2008-05-10 08:55:43.000000000 -0700
@@ -118,7 +118,7 @@
 
 		category = libhal_device_get_property_string (priv->hal_ctx, udi, "info.category", NULL);
 		if (category) {
-			is_wired = strcmp (category, "net.80203") == 0;
+			is_wired = !strcmp (category, "net.80203") || !strcmp (category, "net.bluetooth");
 			libhal_free_string (category);
 		}
 	}
@@ -294,6 +294,14 @@
 	creator->creator_fn = wired_device_creator;
 	priv->device_creators = g_slist_append (priv->device_creators, creator);
 
+	/* Bluetooth NAP device */
+	creator = g_slice_new0 (DeviceCreator);
+	creator->device_type_name = g_strdup ("Ethernet");
+	creator->capability_str = g_strdup ("net.bluetooth");
+	creator->is_device_fn = is_wired_device;
+	creator->creator_fn = wired_device_creator;
+	priv->device_creators = g_slist_append (priv->device_creators, creator);
+
 	/* Wireless device */
 	creator = g_slice_new0 (DeviceCreator);
 	creator->device_type_name = g_strdup ("wireless (802.11)");
diff -Nru NetworkManager-0.7.0.orig/system-settings/src/nm-system-config-hal-manager.c NetworkManager-0.7.0/system-settings/src/nm-system-config-hal-manager.c
--- NetworkManager-0.7.0.orig/system-settings/src/nm-system-config-hal-manager.c	2008-04-08 14:05:33.000000000 -0700
+++ NetworkManager-0.7.0/system-settings/src/nm-system-config-hal-manager.c	2008-05-10 08:49:28.000000000 -0700
@@ -79,7 +79,7 @@
 		goto out;
 
 	for (iter = capabilities; iter && (devtype == DEVICE_TYPE_UNKNOWN); iter = g_slist_next (iter)) {
-		if (!strcmp (iter->data, "net.80203"))
+		if (!strcmp (iter->data, "net.80203") || !strcmp(iter->data, "net.bluetooth"))
 			devtype = DEVICE_TYPE_802_3_ETHERNET;
 		else if (!strcmp (iter->data, "net.80211"))
 			devtype = DEVICE_TYPE_802_11_WIRELESS;
@@ -210,6 +210,7 @@
 	dbus_g_proxy_connect_signal (priv->proxy, "NewCapability", G_CALLBACK (device_new_capability_cb), manager, NULL);
 
 	initial_add_devices_of_type (manager, "net.80203");
+	initial_add_devices_of_type (manager, "net.bluetooth");
 	initial_add_devices_of_type (manager, "net.80211");
 	initial_add_devices_of_type (manager, "modem");
 
