diff --git a/ChangeLog b/ChangeLog
index 187adec157..0339cde2c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-07  Robert Love  <rml@novell.com>
+
+	Patch by Stefan Seyfried <seife@suse.de>:
+	* libnm-util/cipher.c: Fix off-by-one error in cipher_bin2hexstr.
+
 2006-02-06  Robert Love  <rml@novell.com>
 
 	* src/nm-device-802-11-wireless.c: Fix leak in supplicant_status_cb().
diff --git a/libnm-util/cipher.c b/libnm-util/cipher.c
index 25ca7854c0..9377ed8e44 100644
--- a/libnm-util/cipher.c
+++ b/libnm-util/cipher.c
@@ -144,7 +144,7 @@ cipher_bin2hexstr (const char *bytes,
 	g_return_val_if_fail (len > 0, NULL);
 	g_return_val_if_fail (len < 256, NULL);	/* Arbitrary limit */
 
-	result = g_malloc0 (len * 2);
+	result = g_malloc0 (len * 2 + 1);
 	for (i = 0; i < len; i++)
 	{
 		result[2*i] = hex_digits[(bytes[i] >> 4) & 0xf];