1 files changed, 3 insertions, 0 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 4c7c28c3e..bc22d68b3 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1534,6 +1534,9 @@ main ( int argc, char **argv)
       comopt.keyboxd_program = NULL;
     }
 
+  if (comopt.no_autostart)
+    opt.autostart = 0;
+
   if (pwfd != -1)	/* Read the passphrase now.  */
     read_passphrase_from_fd (pwfd);