diff --git a/ChangeLog b/ChangeLog
index 40bd0ae7a9..0d13fafa6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-20  Dan Williams  <dcbw@redhat.com>
+
+	* src/supplicant-manager/nm-supplicant-config.c
+		- (ADD_STRING_LIST_VAL): don't add empty values to the supplicant config
+
 2008-10-20  Dan Williams  <dcbw@redhat.com>
 
 	* src/dhcp-manager/nm-dhcp-manager.c
diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
index aa956cabcd..8caad2f3c2 100644
--- a/src/supplicant-manager/nm-supplicant-config.c
+++ b/src/supplicant-manager/nm-supplicant-config.c
@@ -438,7 +438,10 @@ nm_supplicant_config_add_setting_wireless (NMSupplicantConfig * self,
 		} \
 		if (ucase) \
 		  g_string_ascii_up (str); \
-		success = nm_supplicant_config_add_option (self, name, str->str, -1, secret); \
+		if (str->len) \
+			success = nm_supplicant_config_add_option (self, name, str->str, -1, secret); \
+		else \
+			success = TRUE; \
 		g_string_free (str, TRUE); \
 		if (!success) { \
 			nm_warning ("Error adding %s to supplicant config.", name); \