diff --git a/hosts/kuro/default.nix b/hosts/kuro/default.nix
index aec70c8d..bee4e666 100644
--- a/hosts/kuro/default.nix
+++ b/hosts/kuro/default.nix
@@ -70,6 +70,7 @@
     themes.fluorescence.enable = true;
   };
 
+  programs.ssh.startAgent = true;
   networking.networkmanager.enable = true;
   time.timeZone = "America/Toronto";
 }
diff --git a/hosts/shiro/default.nix b/hosts/shiro/default.nix
index ca0ac76c..e29c0cf1 100644
--- a/hosts/shiro/default.nix
+++ b/hosts/shiro/default.nix
@@ -67,6 +67,7 @@
     themes.fluorescence.enable = true;
   };
 
+  programs.ssh.startAgent = true;
   networking.wireless.enable = true;
   hardware.opengl.enable = true;
 
diff --git a/modules/shell/gnupg.nix b/modules/shell/gnupg.nix
index 0f84b319..c5c4912e 100644
--- a/modules/shell/gnupg.nix
+++ b/modules/shell/gnupg.nix
@@ -19,17 +19,12 @@ in {
       #      is cleaner than overriding the systemd unit.
       home.xdg.configFile."gnupg/gpg-agent.conf" = {
         text = ''
-          enable-ssh-support
-          allow-emacs-pinentry
           default-cache-ttl ${toString gnupgCfg.cacheTTL}
           pinentry-program ${pkgs.pinentry.gtk2}/bin/pinentry
         '';
       };
     };
 
-    programs.gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
+    programs.gnupg.agent.enable = true;
   };
 }