diff --git a/ChangeLog b/ChangeLog
index a8749762b1..d45298b91e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-17  Dan Williams  <dcbw@redhat.com>
+
+	* src/NetworkManagerAP.c
+		- (nm_ap_set_user_addresses): uppercase any BSSID passed in from the
+			applet.  This ensures that the case between the seen-bssids and
+			the bssids reported by the driver match.
+
 2007-08-17  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-device-802-11-wireless.c
diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c
index 24889fa9eb..a27b2f83c4 100644
--- a/src/NetworkManagerAP.c
+++ b/src/NetworkManagerAP.c
@@ -928,7 +928,7 @@ void nm_ap_set_user_addresses (NMAccessPoint *ap, GSList *list)
 	for (elt = list; elt; elt = g_slist_next (elt))
 	{
 		if (elt->data)
-			new = g_slist_append (new, g_strdup (elt->data));
+			new = g_slist_append (new, g_ascii_strup (elt->data, -1));
 	}
 
 	priv->user_addresses = new;