diff --git a/.ssh/config b/.ssh/config
index 4f21886..7b5d663 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -12,31 +12,42 @@ StrictHostKeyChecking		accept-new
 VerifyHostKeyDNS		yes
 VisualHostKey			yes
 
+# Temp.
+Host zapp
+  Hostname			zapp.opensourcerers.net
+  Port				9922
+  ForwardAgent			yes
+  RemoteForward			~/.gnupg/S.gpg-agent	~/.gnupg/S.gpg-agent.extra
+
 # Remote servers.
 Host bender fry leela mirror seedbox
   HostName			%n.hosts.slackware.network
   Port				9922
   ForwardAgent			yes
+  RemoteForward			~/.gnupg/S.gpg-agent	~/.gnupg/S.gpg-agent.extra
 
 Host esx0.hosts.slackware.network esx1.hosts.slackware.network
   Port				22
-  ForwardAgent			no
 
 Host *.hosts.slackware.network
   Port				9922
   ForwardAgent			yes
+  RemoteForward			~/.gnupg/S.gpg-agent	~/.gnupg/S.gpg-agent.extra
 
 # Home stuff.
 Host afterdark.org.uk
   Port				6722
   ForwardAgent			yes
+  RemoteForward			~/.gnupg/S.gpg-agent	~/.gnupg/S.gpg-agent.extra
 
-Host phil lil tommy
+Host phil lil tommy-wifi
   ForwardAgent			yes
   ForwardX11Trusted		yes
+  RemoteForward			~/.gnupg/S.gpg-agent	~/.gnupg/S.gpg-agent.extra
 
 Host full-* build-* clone-*
   ForwardAgent			yes
+  RemoteForward			~/.gnupg/S.gpg-agent	~/.gnupg/S.gpg-agent.extra
   User				root
 
 # GitHub.