diff --git a/ChangeLog b/ChangeLog
index 3a2540f65e..b6e4f2388e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-04  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-device-802-11-wireless.c
+		- (supplicant_iface_scanned_ap_cb): fix parsing of hidden APs due to
+			odd length of ESSID returned from ieee80211 stack-based drivers
+
 2006-12-04  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-device-802-11-wireless.c
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index 2e0bc60037..3fe0451364 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -2209,8 +2209,9 @@ supplicant_iface_scanned_ap_cb (NMSupplicantInterface * iface,
 				if (ssid_len <= 0)
 					goto next;
 				/* Stupid ieee80211 layer uses <hidden> */
-				if ((ssid_len == 8) && (memcmp (entry.bytearray_value, "<hidden>", 8) == 0))
-					goto out;
+				if (((ssid_len == 8) || (ssid_len == 9))
+				        && (memcmp (entry.bytearray_value, "<hidden>", 8) == 0))
+					goto next;
 				memset (&ssid, 0, sizeof (ssid));
 				memcpy (&ssid, entry.bytearray_value, ssid_len);
 				ssid[32] = '\0';