diff --git a/group_vars/all b/group_vars/all
index 396b603..3d4379a 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -29,6 +29,9 @@ ssh:
     user_key: /root/id_rsa
     enable_sshd: False
 
+gnupg:
+    enable_agent: True
+
 mail:
     sync_tool: isync
     sync_pim: True
diff --git a/roles/gnupg/tasks/main.yml b/roles/gnupg/tasks/main.yml
index c0642c1..5c2991a 100644
--- a/roles/gnupg/tasks/main.yml
+++ b/roles/gnupg/tasks/main.yml
@@ -1,3 +1,19 @@
 ---
 - name: Install gnupg
   pacman: name=gnupg state=present
+
+- name: Enable gpg-agent.socket
+  systemd: name=gpg-agent.socket user=yes enabled=yes state=started
+  become: yes
+  become_user: "{{ user.name }}"
+  environment:
+    XDG_RUNTIME_DIR: "/run/user/{{ user.uid }}"
+  when: gnupg.enable_agent == True
+
+- name: Enable dirmngr.socket
+  systemd: name=dirmngr.socket user=yes enabled=yes state=started
+  become: yes
+  become_user: "{{ user.name }}"
+  environment:
+    XDG_RUNTIME_DIR: "/run/user/{{ user.uid }}"
+  when: gnupg.enable_agent == True