diff --git a/g10/ChangeLog b/g10/ChangeLog
index 6cad0870a..97c2120ed 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-02  Werner Koch  <wk@g10code.com>
+
+	* card-util.c (card_edit): Change prompt to "gpg/card".
+	* keyedit.c (keyedit_menu): Change prompt to "gpg".
+
 2009-12-17  Werner Koch  <wk@g10code.com>
 
 	* sig-check.c (do_check_messages): Evaluate the HAS_EXPIRED flag.
diff --git a/g10/card-util.c b/g10/card-util.c
index 96a994c98..9bd5013a1 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -1817,7 +1817,7 @@ card_edit (strlist_t commands)
 	    if (!have_commands)
               {
 		tty_enable_completion (card_edit_completion);
-		answer = cpr_get_no_help("cardedit.prompt", _("Command> "));
+		answer = cpr_get_no_help("cardedit.prompt", _("gpg/card> "));
 		cpr_kill_prompt();
 		tty_disable_completion ();
               }
diff --git a/g10/keyedit.c b/g10/keyedit.c
index e0f6dd0a0..56e1e82b9 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1616,7 +1616,7 @@ keyedit_menu( const char *username, STRLIST locusr,
 	    if( !have_commands )
 	      {
 		tty_enable_completion(keyedit_completion);
-		answer = cpr_get_no_help("keyedit.prompt", _("Command> "));
+		answer = cpr_get_no_help("keyedit.prompt", "gpg> ");
 		cpr_kill_prompt();
 		tty_disable_completion();
 	      }