diff --git a/ChangeLog b/ChangeLog
index b02ac11521..ac5ff356de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-06-13  Tambet Ingo  <tambet@ximian.com>
 
+	* src/NetworkManagerAP.c (foreach_property_cb): Set WEP capabilities too!
+	(0 & 0 == 0, doh)
+
 	* src/nm-device.c (nm_device_state_changed): Emit the signal before handling it
 	because the handling code will cause the next state change and signal listeners
 	get the signals in wrong order.
diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c
index ab0ffe8343..113a634748 100644
--- a/src/NetworkManagerAP.c
+++ b/src/NetworkManagerAP.c
@@ -470,7 +470,7 @@ foreach_property_cb (gpointer key, gpointer value, gpointer user_data)
 				guint cur_caps;
 
 				cur_caps = nm_ap_get_capabilities (ap);
-				if (cur_caps & NM_802_11_CAP_NONE || cur_caps & NM_802_11_CAP_PROTO_NONE)
+				if (cur_caps == NM_802_11_CAP_NONE || cur_caps & NM_802_11_CAP_PROTO_NONE)
 					nm_ap_add_capabilities_for_wep (ap);
 			}
 		}