diff --git a/ChangeLog b/ChangeLog
index 588ae3a893..4e9fde0f3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2006-01-30  Robert Love  <rml@novell.com>
+2006-01-31  Robert Love  <rml@novell.com>
+
+	* src/nm-device-802-11-wireless.c: Set "scan_ssid 1" if the requested
+	  AP is not broadcasting, to scan with probe request frames.  Required
+	  for non-broadcast networks.
+
+2006-01-31  Robert Love  <rml@novell.com>
 
 	* src/nm-device-802-11-wireless.c: Make the wpa_supplicant a
 	  preprocessor define (still 20s).  Fix message text in nm_info()
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index 502f794fb7..19934cc10c 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -2490,6 +2490,14 @@ supplicant_send_network_config (NMDevice80211Wireless *self,
 			"SET_NETWORK %i ssid %s", nwid, hex_essid))
 		goto out;
 
+	/* For non-broadcast networks, we need to set "scan_ssid 1" to scan with probe request frames. */
+	if (nm_ap_get_artificial (ap))
+	{
+		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
+				"SET_NETWORK %i scan_ssid 1", nwid))
+			goto out;
+	}
+
 	/* Ad-Hoc ? */
 	user_created = nm_ap_get_user_created (ap);
 	if (user_created)