2 files changed, 12 insertions, 5 deletions

diff --git a/doc/guix.texi b/doc/guix.texi
index aee2fc329fb..a38a04096ca 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -25038,6 +25038,9 @@ may cause undefined behaviour.
 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}.
 
+@item @code{shepherd-provision} (default: @code{'(autossh)})
+The list of symbols defining the name(s) of the Shepherd service.
+
 @end table
 @end deftp
 
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 675a15b6350..ddb985e51bb 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -624,19 +624,23 @@ object."
   (ssh-options     autossh-configuration-ssh-options
                    (default '()))
   (auto-start?     autossh-configuration-auto-start?
-                   (default #t)))
+                   (default #t))
+  (shepherd-provision autossh-configuration-shepherd-provision
+                   (default '(autossh))))
 
 (define (autossh-file-name config file)
   "Return a path in /var/run/autossh/ that is writable
    by @code{user} from @code{config}."
-  (string-append "/var/run/autossh/"
-                 (autossh-configuration-user config)
-                 "/" file))
+  (string-append "/var/run/"
+                 (symbol->string
+                  (first (autossh-configuration-shepherd-provision config))) "/"
+                 (autossh-configuration-user config) "/"
+                 file))
 
 (define (autossh-shepherd-service config)
   (shepherd-service
    (documentation "Automatically set up ssh connections (and keep them alive).")
-   (provision '(autossh))
+   (provision (autossh-configuration-shepherd-provision config))
    (requirement '(user-processes))
    (start #~(make-forkexec-constructor
              (list #$(file-append autossh "/bin/autossh")