diff --git a/ChangeLog b/ChangeLog
index 33e0aca951..2ec5cda750 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-27  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Bill Nottingham
+
+	* src/supplicant-manager/nm-supplicant-config.c
+		- (ADD_STRING_VAL): use correct length for binary blobs when sending
+			data to the supplicant
+
 2007-09-27  Dan Williams  <dcbw@redhat.com>
 
 	* src/NetworkManagerSystem.c
diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
index 78415dee3f..0aafee0436 100644
--- a/src/supplicant-manager/nm-supplicant-config.c
+++ b/src/supplicant-manager/nm-supplicant-config.c
@@ -310,7 +310,7 @@ nm_supplicant_config_add_setting_wireless (NMSupplicantConfig * self,
 			value = nm_utils_hexstr2bin (field, strlen (field)); \
 		} else \
 			value = g_strdup (field); \
-		success = nm_supplicant_config_add_option (self, name, value, -1, secret); \
+		success = nm_supplicant_config_add_option (self, name, value, unhexify ? (strlen (field) / 2) : -1, secret); \
 		g_free (value); \
 		if (!success) { \
 			nm_warning ("Error adding %s to supplicant config.", name); \