diff --git a/pkg.info b/pkg.info
index 9f570de..13c4883 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,13 +1,16 @@
 name: sddm
 description: QML based X11 and Wayland display manager
 version: 0.21.0
-revision: 5
+revision: 6
 url: https://github.com/sddm/sddm
 license: GPL2-only,CC-BY-3.0
 architecture: any
 type: source
 keep:
   - etc/sddm.conf
+  - etc/pam.d/sddm
+  - etc/pam.d/sddm-autologin
+  - etc/pam.d/sddm-greeter
   - usr/share/sddm/scripts/Xsetup
   - usr/share/sddm/scripts/Xstop
 depends:
diff --git a/source-files/pam.d/sddm-autologin b/source-files/sddm-autologin.pam
similarity index 100%
rename from source-files/pam.d/sddm-autologin
rename to source-files/sddm-autologin.pam
diff --git a/source-files/pam.d/sddm-greeter b/source-files/sddm-greeter.pam
similarity index 82%
rename from source-files/pam.d/sddm-greeter
rename to source-files/sddm-greeter.pam
index dab9c40..6494ecd 100644
--- a/source-files/pam.d/sddm-greeter
+++ b/source-files/sddm-greeter.pam
@@ -4,4 +4,4 @@ auth     required       pam_permit.so
 account  required       pam_permit.so
 password required       pam_deny.so
 session  required       pam_unix.so
--session optional       pam_systemd.so
+-session optional       pam_elogind.so
diff --git a/source-files/pam.d/sddm b/source-files/sddm.pam
similarity index 100%
rename from source-files/pam.d/sddm
rename to source-files/sddm.pam
diff --git a/source.sh b/source.sh
index 649ed4f..99729ce 100644
--- a/source.sh
+++ b/source.sh
@@ -29,9 +29,11 @@ package() {
   install -dm755 "$BPM_OUTPUT"/var/lib/sddm
   chown 64:64 "$BPM_OUTPUT"/var/lib/sddm
 
-  # Install working pam config files
+  # Install pam files
   rm "$BPM_OUTPUT"/etc/pam.d/*
-  install -Dm644 "$BPM_WORKDIR"/pam.d/* -t "$BPM_OUTPUT"/etc/pam.d/
+  install -Dm644 "$BPM_WORKDIR"/sddm.pam "$BPM_OUTPUT"/etc/pam.d/sddm
+  install -Dm644 "$BPM_WORKDIR"/sddm-autologin.pam "$BPM_OUTPUT"/etc/pam.d/sddm-autologin
+  install -Dm644 "$BPM_WORKDIR"/sddm-greeter.pam "$BPM_OUTPUT"/etc/pam.d/sddm-greeter
 
   # Install example config
   "$BPM_OUTPUT"/usr/bin/sddm --example-config > "$BPM_OUTPUT"/etc/sddm.conf