diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index 1bc18ae..a2ab0a9 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -11,6 +11,8 @@
   #:use-module ((gnu home services gnupg)
                 #:select (home-gpg-agent-service-type
                           home-gpg-agent-configuration))
+  #:use-module ((gnu home services ssh)
+                #:select (home-ssh-agent-service-type))
   #:use-module ((gnu packages certs)
                 #:select (nss-certs))
   #:use-module ((gnu packages cdrom)
@@ -528,6 +530,7 @@
 
    (service home-gpg-agent-service-type
             (home-gpg-agent-configuration
-             (ssh-support? #t)
+             (ssh-support? #f)
              (extra-content
-              "allow-emacs-pinentry\n"))))))
+              "allow-emacs-pinentry\n")))
+   (service home-ssh-agent-service-type))))