diff --git a/data/pam/lightdm b/data/pam/lightdm
index fed8a9b..96f39e9 100644
--- a/data/pam/lightdm
+++ b/data/pam/lightdm
@@ -18,3 +18,13 @@ password  required pam_unix.so
 # Setup session
 session   required pam_unix.so
 session   optional pam_systemd.so
+
+# Unlock GNOME Keyring if available
+-auth       optional     pam_gnome_keyring.so
+-session    optional     pam_gnome_keyring.so auto_start
+
+# Unlock KWallet if available
+-auth    optional        pam_kwallet.so
+-auth    optional        pam_kwallet5.so
+-session optional        pam_kwallet.so auto_start
+-session optional        pam_kwallet5.so auto_start
diff --git a/data/pam/lightdm-autologin b/data/pam/lightdm-autologin
index ba7a68c..013ad52 100644
--- a/data/pam/lightdm-autologin
+++ b/data/pam/lightdm-autologin
@@ -18,3 +18,13 @@ password  required pam_deny.so
 # Setup session
 session   required pam_unix.so
 session   optional pam_systemd.so
+
+# Unlock GNOME Keyring if available
+-auth       optional     pam_gnome_keyring.so
+-session    optional     pam_gnome_keyring.so auto_start
+
+# Unlock KWallet if available
+-auth    optional        pam_kwallet.so
+-auth    optional        pam_kwallet5.so
+-session optional        pam_kwallet.so auto_start
+-session optional        pam_kwallet5.so auto_start