diff --git a/g10/ChangeLog b/g10/ChangeLog
index 5cf4ab6a8..d0f1ffba4 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-14  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.c (main): Don't default to import-options convert-sk-to-pk.
+	It causes confusing warning messages when importing a PGP-exported
+	key that contains a secret key without selfsigs followed by the
+	public key.
+
 2005-12-08  David Shaw  <dshaw@jabberwocky.com>
 
 	* keyserver.c (keyserver_fetch): Switch on fast-import before we
diff --git a/g10/gpg.c b/g10/gpg.c
index 81bf454c2..6d211de3d 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1693,7 +1693,6 @@ 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;