diff --git a/home/.ssh/config b/home/.ssh/config
index f58a5d37..a00f477a 100644
--- a/home/.ssh/config
+++ b/home/.ssh/config
@@ -23,11 +23,13 @@ host moria
 	port 221
 	User balrog
 	ForwardAgent yes
+	RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra
 
 host gondor
 	hostname gondor.korhonen.cc
 	port 22
 	User reekymarko
+	RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra
 
 host anitta
 	HostName 10.200.200.4