diff --git a/g10/gpg.c b/g10/gpg.c
index 4bb8ef664..95a78d505 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -531,10 +531,6 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")),
   ARGPARSE_s_n (oInteractive, "interactive", N_("prompt before overwriting")),
 
-  ARGPARSE_s_n (oUseAgent,      "use-agent", "@"),
-  ARGPARSE_s_n (oNoUseAgent, "no-use-agent", "@"),
-  ARGPARSE_s_s (oGpgAgentInfo, "gpg-agent-info", "@"),
-
   ARGPARSE_s_n (oBatch, "batch", "@"),
   ARGPARSE_s_n (oAnswerYes, "yes", "@"),
   ARGPARSE_s_n (oAnswerNo, "no", "@"),
@@ -793,6 +789,9 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oNoAutoKeyLocate, "no-auto-key-locate", "@"),
 
   /* Dummy options with warnings.  */
+  ARGPARSE_s_n (oUseAgent,      "use-agent", "@"),
+  ARGPARSE_s_n (oNoUseAgent, "no-use-agent", "@"),
+  ARGPARSE_s_s (oGpgAgentInfo, "gpg-agent-info", "@"),
   ARGPARSE_s_s (oReaderPort, "reader-port", "@"),
   ARGPARSE_s_s (octapiDriver, "ctapi-driver", "@"),
   ARGPARSE_s_s (opcscDriver, "pcsc-driver", "@"),
@@ -2354,28 +2353,24 @@ main (int argc, char **argv)
 
           case oUseAgent: /* Dummy. */
             break;
+
           case oNoUseAgent:
-	    obsolete_option (configname, configlineno, "--no-use-agent");
+	    obsolete_option (configname, configlineno, "no-use-agent");
             break;
 	  case oGpgAgentInfo:
-	    obsolete_option (configname, configlineno, "--gpg-agent-info");
+	    obsolete_option (configname, configlineno, "gpg-agent-info");
             break;
-
           case oReaderPort:
-	    obsolete_scdaemon_option (configname, configlineno,
-                                      "--reader-port");
+	    obsolete_scdaemon_option (configname, configlineno, "reader-port");
             break;
           case octapiDriver:
-	    obsolete_scdaemon_option (configname, configlineno,
-                                      "--ctapi-driver");
+	    obsolete_scdaemon_option (configname, configlineno, "ctapi-driver");
             break;
           case opcscDriver:
-	    obsolete_scdaemon_option (configname, configlineno,
-                                      "--pcsc-driver");
+	    obsolete_scdaemon_option (configname, configlineno, "pcsc-driver");
             break;
           case oDisableCCID:
-	    obsolete_scdaemon_option (configname, configlineno,
-                                      "--disable-ccid");
+	    obsolete_scdaemon_option (configname, configlineno, "disable-ccid");
             break;
 
 	  case oAnswerYes: opt.answer_yes = 1; break;
diff --git a/g10/misc.c b/g10/misc.c
index fa04387fa..76faa49f6 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -1038,8 +1038,8 @@ obsolete_option (const char *configname, unsigned int configlineno,
     log_info (_("%s:%u: obsolete option \"%s\" - it has no effect\n"),
               configname, configlineno, name);
   else
-    log_info (_("WARNING: \"%s\" is an obsolete option - it has no effect\n"),
-              name);
+    log_info (_("WARNING: \"%s%s\" is an obsolete option - it has no effect\n"),
+              "--", name);
 }
 
 
@@ -1052,8 +1052,9 @@ obsolete_scdaemon_option (const char *configname, unsigned int configlineno,
                 " - it only has effect in %s\n"),
               configname, configlineno, name, SCDAEMON_NAME EXTSEP_S "conf");
   else
-    log_info (_("WARNING: \"%s\" is an obsolete option"
-                " - it has no effect except on %s\n"), name, SCDAEMON_NAME);
+    log_info (_("WARNING: \"%s%s\" is an obsolete option"
+                " - it has no effect except on %s\n"),
+              "--", name, SCDAEMON_NAME);
 }