diff --git a/agent/ChangeLog b/agent/ChangeLog
index 4cbe8d927..8596a2bec 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,10 +1,15 @@
+2009-06-05  Werner Koch  <wk@g10code.com>
+
+	* protect-tool.c (store_private_key): Fix last change by appending
+	a ".key".
+
 2009-06-03  Werner Koch  <wk@g10code.com>
 
 	* protect-tool.c: Include estream.h.
 	(store_private_key): Replace stdio streams by estream functions
 	for a portable use of the "x" mode.
 	* trustlist.c: Include estream.h.
-	(agent_marktrusted): Repalce stdio stream by estream functions.
+	(agent_marktrusted): Replace stdio stream by estream functions.
 
 	* protect-tool.c (store_private_key): Use bin2hex.	
 
diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index 58bda715a..0e48124d8 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -1205,6 +1205,7 @@ store_private_key (const unsigned char *grip,
   char hexgrip[40+4+1];
   
   bin2hex (grip, 20, hexgrip);
+  strcpy (hexgrip+40, ".key");
 
   fname = make_filename (opt_homedir, GNUPG_PRIVATE_KEYS_DIR, hexgrip, NULL);
   if (force)