diff --git a/systemd-mini.changes b/systemd-mini.changes
index d28a872..e3cc72e 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 10 09:51:06 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Adjust pam macros
+
 -------------------------------------------------------------------
 Wed Sep  8 17:01:58 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 2de1c70..f07a4c5 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -621,8 +621,8 @@ Have fun with these services at your own risk.
         -Dsplit-bin=true \
         -Dsystem-uid-max=499 \
         -Dsystem-gid-max=499 \
-        -Dpamconfdir=%{_distconfdir}/pam.d \
-        -Dpamlibdir=%{_pamdir} \
+        -Dpamconfdir=%{_pam_vendordir} \
+        -Dpamlibdir=%{_pam_moduledir} \
         -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \
         -Drpmmacrosdir=no \
         -Dcertificate-root=%{_sysconfdir}/pki/systemd \
@@ -752,7 +752,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants}
 rm -f %{buildroot}/etc/systemd/system/default.target
 
 # Replace upstream systemd-user with the openSUSE one.
-install -m0644 %{S:2} %{buildroot}%{_distconfdir}/pam.d
+install -m0644 %{S:2} %{buildroot}%{_pam_vendordir}
 
 # don't enable wall ask password service, it spams every console (bnc#747783)
 rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path
@@ -1379,7 +1379,7 @@ fi
 %dir %{_prefix}/lib/systemd/system-shutdown/
 %dir %{_prefix}/lib/systemd/system-sleep/
 
-%{_pamdir}/pam_systemd.so
+%{_pam_moduledir}/pam_systemd.so
 
 %if %{with gnuefi}
 %dir %{_prefix}/lib/systemd/boot
@@ -1421,7 +1421,7 @@ fi
 %dir %{_distconfdir}/X11/xinit/xinitrc.d
 %{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
 
-%{_distconfdir}/pam.d/systemd-user
+%{_pam_vendordir}/systemd-user
 
 %config(noreplace) %{_sysconfdir}/systemd/journald.conf
 %config(noreplace) %{_sysconfdir}/systemd/logind.conf
@@ -1869,7 +1869,7 @@ fi
 %{_prefix}/lib/systemd/systemd-homework
 %{_unitdir}/systemd-homed.service
 %{_unitdir}/systemd-homed-activate.service
-%{_pamdir}/pam_systemd_home.so
+%{_pam_moduledir}/pam_systemd_home.so
 %{_datadir}/dbus-1/system-services/org.freedesktop.home1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.home1.policy
diff --git a/systemd.changes b/systemd.changes
index d28a872..e3cc72e 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 10 09:51:06 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Adjust pam macros
+
 -------------------------------------------------------------------
 Wed Sep  8 17:01:58 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 336ac69..a53416e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -619,8 +619,8 @@ Have fun with these services at your own risk.
         -Dsplit-bin=true \
         -Dsystem-uid-max=499 \
         -Dsystem-gid-max=499 \
-        -Dpamconfdir=%{_distconfdir}/pam.d \
-        -Dpamlibdir=%{_pamdir} \
+        -Dpamconfdir=%{_pam_vendordir} \
+        -Dpamlibdir=%{_pam_moduledir} \
         -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \
         -Drpmmacrosdir=no \
         -Dcertificate-root=%{_sysconfdir}/pki/systemd \
@@ -750,7 +750,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants}
 rm -f %{buildroot}/etc/systemd/system/default.target
 
 # Replace upstream systemd-user with the openSUSE one.
-install -m0644 %{S:2} %{buildroot}%{_distconfdir}/pam.d
+install -m0644 %{S:2} %{buildroot}%{_pam_vendordir}
 
 # don't enable wall ask password service, it spams every console (bnc#747783)
 rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path
@@ -1377,7 +1377,7 @@ fi
 %dir %{_prefix}/lib/systemd/system-shutdown/
 %dir %{_prefix}/lib/systemd/system-sleep/
 
-%{_pamdir}/pam_systemd.so
+%{_pam_moduledir}/pam_systemd.so
 
 %if %{with gnuefi}
 %dir %{_prefix}/lib/systemd/boot
@@ -1419,7 +1419,7 @@ fi
 %dir %{_distconfdir}/X11/xinit/xinitrc.d
 %{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
 
-%{_distconfdir}/pam.d/systemd-user
+%{_pam_vendordir}/systemd-user
 
 %config(noreplace) %{_sysconfdir}/systemd/journald.conf
 %config(noreplace) %{_sysconfdir}/systemd/logind.conf
@@ -1867,7 +1867,7 @@ fi
 %{_prefix}/lib/systemd/systemd-homework
 %{_unitdir}/systemd-homed.service
 %{_unitdir}/systemd-homed-activate.service
-%{_pamdir}/pam_systemd_home.so
+%{_pam_moduledir}/pam_systemd_home.so
 %{_datadir}/dbus-1/system-services/org.freedesktop.home1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.home1.policy