diff --git a/ChangeLog b/ChangeLog
index 6c75bdf846..6605c4d649 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-23  Dan Williams  <dcbw@redhat.com>
+
+	* src/supplicant-manager/nm-supplicant-config.c
+		- (nm_supplicant_config_add_setting_wireless_security): only add
+			WPA-specific options when WPA is in use
+
 2007-10-23  Dan Williams  <dcbw@redhat.com>
 
 	* src/supplicant-manager/nm-supplicant-config.c
diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
index a5c55b129c..ca5a752083 100644
--- a/src/supplicant-manager/nm-supplicant-config.c
+++ b/src/supplicant-manager/nm-supplicant-config.c
@@ -471,11 +471,17 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig * self,
 	ADD_STRING_VAL (setting->private_key_passwd, "private_key_passwd", FALSE, FALSE, TRUE);
 	ADD_STRING_VAL (setting->phase2_private_key_passwd, "private_key2_passwd", FALSE, FALSE, TRUE);
 
-	ADD_STRING_LIST_VAL (setting->proto, "proto", TRUE, FALSE);
-	ADD_STRING_LIST_VAL (setting->pairwise, "pairwise", TRUE, FALSE);
-	ADD_STRING_LIST_VAL (setting->group, "group", TRUE, FALSE);
 	ADD_STRING_LIST_VAL (setting->eap, "eap", TRUE, FALSE);
 
+	/* Only WPA-specific things when using WPA */
+	if (   !strcmp (setting->key_mgmt, "wpa-none")
+	    || !strcmp (setting->key_mgmt, "wpa-psk")
+	    || !strcmp (setting->key_mgmt, "wpa-eap")) {
+		ADD_STRING_LIST_VAL (setting->proto, "proto", TRUE, FALSE);
+		ADD_STRING_LIST_VAL (setting->pairwise, "pairwise", TRUE, FALSE);
+		ADD_STRING_LIST_VAL (setting->group, "group", TRUE, FALSE);
+	}
+
 	ADD_BLOB_VAL (setting->ca_cert, "ca_cert", connection_uid);
 	ADD_BLOB_VAL (setting->client_cert, "client_cert", connection_uid);
 	ADD_BLOB_VAL (setting->private_key, "private_key", connection_uid);