diff --git a/ChangeLog b/ChangeLog
index e8e7f9e00f..fdf12deb82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-23  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Andy Whitcroft <apw@shadowen.org> (Gnome.org #410426)
+
+	* src/NetworkManagerAP.c
+		- (add_capabilities_from_cipher): fix addition of WEP capabilities by
+			OR-ing rather than AND-ing
+
 2007-02-20  Tambet Ingo  <tambet@ximian.com>
 
 	* libnm-glib/nm-device-802-11-wireless.c: Add "network-added" and
diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c
index c784dc38cf..9cb605b650 100644
--- a/src/NetworkManagerAP.c
+++ b/src/NetworkManagerAP.c
@@ -912,12 +912,14 @@ static guint32 add_capabilities_from_cipher (guint32 caps, int cipher)
 {
 	if (cipher & IW_AUTH_CIPHER_WEP40)
 	{
-		caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP40);
+		caps |= NM_802_11_CAP_PROTO_WEP;
+		caps |= NM_802_11_CAP_CIPHER_WEP40;
 		caps &= ~NM_802_11_CAP_PROTO_NONE;
 	}
 	if (cipher & IW_AUTH_CIPHER_WEP104)
 	{
-		caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP104);
+		caps |= NM_802_11_CAP_PROTO_WEP;
+		caps |= NM_802_11_CAP_CIPHER_WEP104;
 		caps &= ~NM_802_11_CAP_PROTO_NONE;
 	}
 	if (cipher & IW_AUTH_CIPHER_TKIP)