diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 34d29390..974e1e20 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-17  Marcus Brinkmann  <marcus@g10code.de>
+
+	* rungpg.c (build_argv): Use --no-sk-comment, not --no-comment.
+
 2004-06-23  Marcus Brinkmann  <marcus@g10code.de>
 
 	* key.c (_gpgme_key_append_name): Make sure tail points to the
diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index fd5e6c12..5d42f932 100644
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -566,7 +566,7 @@ build_argv (engine_gpg_t gpg)
     argc++;
   if (!gpg->cmd.used)
     argc++;	/* --batch */
-  argc += 1; /* --no-comment */
+  argc += 1;	/* --no-sk-comment */
 
   argv = calloc (argc + 1, sizeof *argv);
   if (!argv)
@@ -625,7 +625,7 @@ build_argv (engine_gpg_t gpg)
         }
       argc++;
     }
-  argv[argc] = strdup ("--no-comment");
+  argv[argc] = strdup ("--no-sk-comment");
   if (!argv[argc])
     {
       int saved_errno = errno;