diff --git a/g10/ChangeLog b/g10/ChangeLog
index d0f1ffba4..62d27b72c 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-18  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.c (main): Restore convert-sk-to-pk as programs rely on it.
+
+	* keyid.c (usagestr_from_pk): Remove special PUBKEY_USAGE_CERT
+	flag.  It's no longer needed.
+
 2005-12-14  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpg.c (main): Don't default to import-options convert-sk-to-pk.
diff --git a/g10/gpg.c b/g10/gpg.c
index 6d211de3d..81bf454c2 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1693,6 +1693,7 @@ main (int argc, char **argv )
     opt.pgp2_workarounds = 1;
     opt.force_v3_sigs = 1;
     opt.escape_from = 1;
+    opt.import_options=IMPORT_SK2PK;
     opt.export_options=EXPORT_ATTRIBUTES;
     opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG;
     opt.keyserver_options.export_options=EXPORT_ATTRIBUTES;
diff --git a/g10/keyid.c b/g10/keyid.c
index 7c2bd3ba4..86a204ff3 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -543,13 +543,9 @@ usagestr_from_pk( PKT_public_key *pk )
   static char buffer[10];
   int i = 0;
   unsigned int use = pk->pubkey_usage;
-    
+
   if ( use & PUBKEY_USAGE_SIG )
-    {
-      if (pk->is_primary)
-        use|=PUBKEY_USAGE_CERT;
-      buffer[i++] = 'S';
-    }
+    buffer[i++] = 'S';
 
   if ( use & PUBKEY_USAGE_CERT )
     buffer[i++] = 'C';