diff --git a/g10/ChangeLog b/g10/ChangeLog
index 74adadb58..a6c640aeb 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-27  David Shaw  <dshaw@jabberwocky.com>
+
+	* keyid.c (keyid_from_sk, keyid_from_pk): Use 0xFFFFFFFFFFFFFFFF
+	instead of 0x0000000000000000 for the invalid key ID since
+	all-zeroes is reserved for the anonymous recipient.
+
+	* keyedit.c (change_passphrase), keygen.c (generate_subkeypair):
+	Fix a string ;)
+
 2005-01-27  Werner Koch  <wk@g10code.com>
 
 	* keygen.c (generate_subkeypair): Detect primary key on-card and
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 84fc6d4cc..39e7fbda6 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1110,7 +1110,7 @@ change_passphrase( KBNODE keyblock )
 	    no_primary_secrets = 1;
 	}
 	else if( sk->protect.s2k.mode == 1002 ) {
-	    tty_printf(_("Secret parts of primary key are store on-card.\n"));
+	    tty_printf(_("Secret parts of primary key are stored on-card.\n"));
 	    no_primary_secrets = 1;
 	}
 	else {
diff --git a/g10/keygen.c b/g10/keygen.c
index 29f1fc6d2..854b7ea21 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -3049,7 +3049,7 @@ generate_subkeypair( KBNODE pub_keyblock, KBNODE sec_keyblock )
 	tty_printf(_("This key is not protected.\n"));
 	break;
       case -2:
-        tty_printf(_("Secret parts of primary key are store on-card.\n"));
+        tty_printf(_("Secret parts of primary key are stored on-card.\n"));
         ask_pass = 1;
         break;
       default:
diff --git a/g10/keyid.c b/g10/keyid.c
index 25d51e3b8..03e816958 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -280,7 +280,7 @@ keyid_from_sk( PKT_secret_key *sk, u32 *keyid )
 	  sk->keyid[1]=keyid[1];
 	}
       else
-	sk->keyid[0]=sk->keyid[1]=keyid[0]=keyid[1]=lowbits=0;
+	sk->keyid[0]=sk->keyid[1]=keyid[0]=keyid[1]=lowbits=0xFFFFFFFF;
     }
   else
     {
@@ -298,7 +298,7 @@ keyid_from_sk( PKT_secret_key *sk, u32 *keyid )
 	  sk->keyid[1] = keyid[1];
 	}
       else
-	sk->keyid[0]=sk->keyid[1]=keyid[0]=keyid[1]=lowbits=0;
+	sk->keyid[0]=sk->keyid[1]=keyid[0]=keyid[1]=lowbits=0xFFFFFFFF;
     }
 
   return lowbits;
@@ -334,7 +334,7 @@ keyid_from_pk( PKT_public_key *pk, u32 *keyid )
 	  pk->keyid[1] = keyid[1];
 	}
       else
-	pk->keyid[0]=pk->keyid[1]=keyid[0]=keyid[1]=lowbits=0;
+	pk->keyid[0]=pk->keyid[1]=keyid[0]=keyid[1]=lowbits=0xFFFFFFFF;
     }
   else
     {
@@ -352,7 +352,7 @@ keyid_from_pk( PKT_public_key *pk, u32 *keyid )
 	  pk->keyid[1] = keyid[1];
 	}
       else
-	pk->keyid[0]=pk->keyid[1]=keyid[0]=keyid[1]=lowbits=0;
+	pk->keyid[0]=pk->keyid[1]=keyid[0]=keyid[1]=lowbits=0xFFFFFFFF;
     }
 
   return lowbits;