2 files changed, 9 insertions, 2 deletions

diff --git a/doc/guix.texi b/doc/guix.texi
index 6bf2ca4f1ad..aee2fc329fb 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -25034,6 +25034,10 @@ The list of command-line arguments to pass to @command{ssh} when it is
 run.  Options @option{-f} and @option{-M} are reserved for AutoSSH and
 may cause undefined behaviour.
 
+@item @code{auto-start?} (default @code{#t})
+Whether this service should be started automatically by the Shepherd.  If it
+is @code{#f}, the service has to be started manually with @command{herd start}.
+
 @end table
 @end deftp
 
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index d5c1c778009..675a15b6350 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -622,7 +622,9 @@ object."
   (port            autossh-configuration-port
                    (default "0"))
   (ssh-options     autossh-configuration-ssh-options
-                   (default '())))
+                   (default '()))
+  (auto-start?     autossh-configuration-auto-start?
+                   (default #t)))
 
 (define (autossh-file-name config file)
   "Return a path in /var/run/autossh/ that is writable
@@ -670,7 +672,8 @@ object."
                                 (autossh-configuration-message config))
                #$(string-append "AUTOSSH_PORT="
                                 (autossh-configuration-port config)))))
-   (stop #~(make-kill-destructor))))
+   (stop #~(make-kill-destructor))
+   (auto-start? (autossh-configuration-auto-start? config))))
 
 (define (autossh-service-activation config)
   (with-imported-modules '((guix build utils))