diff --git a/ChangeLog b/ChangeLog
index 4ef973eda2..6938ddeda2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-10  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-device-802-11-wireless.c
+		- (merge_scanned_ap): make sure non-SSID-broadcasting APs are marked
+			as such, because even if the manager fills in the SSID, NM still
+			has to indicate to wpa_supplicant that the AP isn't broadcasting
+			its SSID
+
 2007-10-10  Tambet Ingo  <tambet@gmail.com>
 
 	Move ppp-manager over to dbus-glib. The big deal is that it was the last piece of
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index 62361743df..a6d35ebaa6 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -1624,15 +1624,10 @@ merge_scanned_ap (NMDevice80211Wireless *self,
 	 * if it can
 	 */
 	ssid = nm_ap_get_ssid (merge_ap);
-	if (!ssid || !ssid->len)
+	if (!ssid || !ssid->len) {
 		g_signal_emit (self, signals[HIDDEN_AP_FOUND], 0, merge_ap);
-
-	/* If the AP is not broadcasting its SSID and matching the SSID with a
-	 * seen-bssids entry failed, mark the AP as non-broadcasting
-	 */
-	ssid = nm_ap_get_ssid (merge_ap);
-	if (!ssid || !ssid->len)
 		nm_ap_set_broadcast (merge_ap, FALSE);
+	}
 
 	for (elt = self->priv->ap_list; elt; elt = g_slist_next (elt)) {
 		NMAccessPoint * list_ap = NM_AP (elt->data);