diff --git a/g10/ChangeLog b/g10/ChangeLog
index 6464b60c6..5fa1bcbc7 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-21  David Shaw  <dshaw@jabberwocky.com>
+
+	* status.c (do_get_from_fd): Accept 'y' as well as 'Y' for
+	--command-fd boolean input.
+
+	* g10.c (main): Add deprecated option warning for
+	--list-ownertrust.  Add --compression-algo alias for
+	--compress-algo.  Change --version output strings to match
+	"showpref" strings, and make translatable.
+
 2003-03-10  Werner Koch  <wk@gnupg.org>
 
 	* compress.c (init_uncompress): Use a 15 bit window size so that
diff --git a/g10/g10.c b/g10/g10.c
index 35f1c27e0..6de44a14e 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -118,6 +118,7 @@ enum cmd_and_opt_values { aNull = 0,
     aListTrustDB,
     aListTrustPath,
     aExportOwnerTrust,
+    aListOwnerTrust,
     aImportOwnerTrust,
     aDeArmor,
     aEnArmor,
@@ -347,7 +348,7 @@ static ARGPARSE_OPTS opts[] = {
     { aExportOwnerTrust,
 	      "export-ownertrust", 256, N_("export the ownertrust values")},
     { aImportOwnerTrust,
-	      "import-ownertrust", 256 , N_("import ownertrust values")},
+	      "import-ownertrust", 256, N_("import ownertrust values")},
     { aUpdateTrustDB,
 	      "update-trustdb",0 , N_("update the trust database")},
     { aCheckTrustDB,
@@ -475,7 +476,8 @@ static ARGPARSE_OPTS opts[] = {
     " --fingerprint [names]      show fingerprints\n"  ) },
 
   /* hidden options */
-    { aExportOwnerTrust, "list-ownertrust",0 , "@"},  /* alias */
+    { aListOwnerTrust, "list-ownertrust", 256, "@"}, /* deprecated */
+    { oCompressAlgo, "compression-algo", 1, "@"}, /* alias */
     { aPrintMDs, "print-mds" , 256, "@"}, /* old */
     { aListTrustDB, "list-trustdb",0 , "@"},
     /* Not yet used */
@@ -645,25 +647,25 @@ strusage( int level )
       case 33: p = _("\nSupported algorithms:\n"); break;
       case 34:
 	if( !pubkeys )
-	    pubkeys = build_list("Pubkey: ", 0, pubkey_algo_to_string,
+	    pubkeys = build_list(_("Pubkey: "), 0, pubkey_algo_to_string,
 							check_pubkey_algo );
 	p = pubkeys;
 	break;
       case 35:
 	if( !ciphers )
-	    ciphers = build_list("Cipher: ", 'S', cipher_algo_to_string,
+	    ciphers = build_list(_("Cipher: "), 'S', cipher_algo_to_string,
 							check_cipher_algo );
 	p = ciphers;
 	break;
       case 36:
 	if( !digests )
-	    digests = build_list("Hash: ", 'H', digest_algo_to_string,
+	    digests = build_list(_("Hash: "), 'H', digest_algo_to_string,
 							check_digest_algo );
 	p = digests;
 	break;
       case 37:
 	if( !zips )
-	    zips = build_list("Compress: ",'Z',compress_algo_to_string,
+	    zips = build_list(_("Compression: "),'Z',compress_algo_to_string,
 			                                check_compress_algo);
 	p = zips;
 	break;
@@ -1294,6 +1296,9 @@ main( int argc, char **argv )
 	  case aListTrustPath: set_cmd( &cmd, aListTrustPath); break;
 	  case aDeArmor: set_cmd( &cmd, aDeArmor); break;
 	  case aEnArmor: set_cmd( &cmd, aEnArmor); break;
+	  case aListOwnerTrust:
+	    deprecated_warning(configname,configlineno,
+			       "--list-ownertrust","--export-ownertrust","");
 	  case aExportOwnerTrust: set_cmd( &cmd, aExportOwnerTrust); break;
 	  case aImportOwnerTrust: set_cmd( &cmd, aImportOwnerTrust); break;
           case aPipeMode: set_cmd( &cmd, aPipeMode); break;
diff --git a/g10/status.c b/g10/status.c
index b665968f0..99f9cfdd2 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -529,7 +529,7 @@ do_get_from_fd( const char *keyword, int hidden, int bool )
     write_status( STATUS_GOT_IT );
 
     if( bool )	 /* Fixme: is this correct??? */
-	return string[0] == 'Y' ? "" : NULL;
+	return (string[0] == 'Y' || string[0] == 'y') ? "" : NULL;
 
     return string;
 }