diff --git a/systemd-mini.changes b/systemd-mini.changes
index 9cbcfcc..3922a25 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Mar 13 15:07:41 UTC 2018 - fbui@suse.com
+
+- Restore (maybe temporarly) "pam_config --add systemd"
+
+  During its installation pam-config seems to overwrite the defaults
+  shipped by "pam" for "some" reasons (see bsc#1084924)
+
+  No idea why but since pam_systemd is not part of the "pam-config"
+  defaults, we need to restore pam_systemd in common-session
+  manually...
+
 -------------------------------------------------------------------
 Fri Mar  9 09:35:59 UTC 2018 - fbui@suse.com
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index bcd6534..50b0231 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -124,6 +124,7 @@ Recommends:     %{name}-bash-completion
 Requires(post): coreutils
 Requires(post): findutils
 Requires(post): systemd-presets-branding
+Requires(post): pam-config >= 0.79-5
 %endif
 
 %if 0%{?bootstrap}
@@ -668,10 +669,14 @@ fi
 # especially important for appliance builds to avoid an identical
 # machine ID in all images.
 if [ $1 -eq 1 ]; then
-	touch     %{_sysconfdir}/machine-id
-	chmod 666 %{_sysconfdir}/machine-id
+        touch     %{_sysconfdir}/machine-id
+        chmod 666 %{_sysconfdir}/machine-id
 fi
 
+%if ! 0%{?bootstrap}
+pam-config --add --systemd || :
+%endif
+
 %sysusers_create %{_sysusersdir}/systemd.conf
 [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || :
 /usr/lib/systemd/systemd-random-seed save || :
diff --git a/systemd.changes b/systemd.changes
index 9cbcfcc..3922a25 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Mar 13 15:07:41 UTC 2018 - fbui@suse.com
+
+- Restore (maybe temporarly) "pam_config --add systemd"
+
+  During its installation pam-config seems to overwrite the defaults
+  shipped by "pam" for "some" reasons (see bsc#1084924)
+
+  No idea why but since pam_systemd is not part of the "pam-config"
+  defaults, we need to restore pam_systemd in common-session
+  manually...
+
 -------------------------------------------------------------------
 Fri Mar  9 09:35:59 UTC 2018 - fbui@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index 3520a0b..9135afa 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -122,6 +122,7 @@ Recommends:     %{name}-bash-completion
 Requires(post): coreutils
 Requires(post): findutils
 Requires(post): systemd-presets-branding
+Requires(post): pam-config >= 0.79-5
 %endif
 
 %if 0%{?bootstrap}
@@ -666,10 +667,14 @@ fi
 # especially important for appliance builds to avoid an identical
 # machine ID in all images.
 if [ $1 -eq 1 ]; then
-	touch     %{_sysconfdir}/machine-id
-	chmod 666 %{_sysconfdir}/machine-id
+        touch     %{_sysconfdir}/machine-id
+        chmod 666 %{_sysconfdir}/machine-id
 fi
 
+%if ! 0%{?bootstrap}
+pam-config --add --systemd || :
+%endif
+
 %sysusers_create %{_sysusersdir}/systemd.conf
 [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || :
 /usr/lib/systemd/systemd-random-seed save || :