diff --git a/ChangeLog b/ChangeLog
index 8911793ea8..d534c264ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-16  Dan Williams  <dcbw@redhat.com>
+
+	* libnm-util/cipher-wpa-psk-passphrase.c
+		- (cipher_wpa_psk_passphrase_new): correct passphrase length, should
+			be 8 - 63 characters inclusive
+
 2006-01-16  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-dbus-nm.c
diff --git a/libnm-util/cipher-wpa-psk-passphrase.c b/libnm-util/cipher-wpa-psk-passphrase.c
index 187a5e375a..eeea7fb99a 100644
--- a/libnm-util/cipher-wpa-psk-passphrase.c
+++ b/libnm-util/cipher-wpa-psk-passphrase.c
@@ -38,8 +38,9 @@ IEEE_802_11_Cipher * cipher_wpa_psk_passphrase_new (void)
 
 	cipher->refcount = 1;
 	cipher->we_cipher = IW_AUTH_CIPHER_TKIP;
+	/* Passphrase between 8 and 63 characters inclusive */
 	cipher->input_min = 8;
-	cipher->input_max = WPA_PMK_LEN * 2;
+	cipher->input_max = (WPA_PMK_LEN * 2) - 1;
 	cipher->cipher_hash_func = cipher_wpa_psk_passphrase_hash_func;
 	cipher->cipher_input_validate_func = cipher_default_validate_func;