diff --git a/.gnupg/gpg.conf b/.gnupg/gpg.conf
index b30aeaa..48d3860 100644
--- a/.gnupg/gpg.conf
+++ b/.gnupg/gpg.conf
@@ -6,5 +6,5 @@ auto-key-locate local
 # It will disable options before this marked block, but it will
 # never change anything below these lines.
 
-
-default-key  3159FF4CB13EBFB4
\ No newline at end of file
+use-agent
+default-key  3159FF4CB13EBFB4
diff --git a/.ssh/config b/.ssh/config
new file mode 100644
index 0000000..39f9ef0
--- /dev/null
+++ b/.ssh/config
@@ -0,0 +1,14 @@
+#ControlMaster auto
+#ControlPath ~/.ssh/controlmasters/%r@%h:%p
+CanonicalizeHostname yes
+CanonicalDomains home.ld linux-help.org
+CanonicalizeMaxDots 1
+CanonicalizeFallbackLocal yes
+
+GSSAPIAuthentication no
+GSSAPIDelegateCredentials no
+
+Include config.d/*.inc
+IdentityAgent /run/user/%i/gnupg/S.gpg-agent.ssh
+#RemoteForward /run/user/%i/gnupg/S.gpg-agent /run/user/%i/gnupg/S.gpg-agent.extra
+