diff --git a/login.pamd b/login.pamd
index 446f853..2f1d2eb 100644
--- a/login.pamd
+++ b/login.pamd
@@ -7,4 +7,5 @@ session   required   pam_loginuid.so
 session   optional   pam_keyinit.so force revoke
 session   include    common-session
 #session  optional   pam_lastlog.so nowtmp showfailed
+session   optional   pam_motd.so
 session   optional   pam_mail.so standard
diff --git a/python3-libmount.spec b/python3-libmount.spec
index 20c6d90..d7aa86f 100644
--- a/python3-libmount.spec
+++ b/python3-libmount.spec
@@ -370,6 +370,7 @@ Conflicts:      util-linux < 2.25
 
 %description systemd
 %else
+
 %description
 %endif
 This package contains low-level util-linux utilities that use systemd.
@@ -404,12 +405,14 @@ Group:          %group_pl
 
 %description -n python3-libmount
 %else
+
 %description
 %endif
 This package contains the Python bindings for util-linux libmount
 library.
 
 %endif
+
 %prep
 %setup -q -n %{_name}-%{version}
 cp -a %{S:2} .
@@ -866,6 +869,7 @@ done
 %if 0%{?suse_version} >= 1330
 %pre -n uuidd
 %else
+
 %pre -n uuidd
 getent group uuidd >/dev/null || /usr/sbin/groupadd -r uuidd
 getent passwd uuidd >/dev/null || \
@@ -1324,6 +1328,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %if %build_util_linux
 %files systemd
 %else
+
 %files
 %endif
 %defattr(-, root, root)
@@ -1374,6 +1379,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %if %build_util_linux
 %files -n python3-libmount
 %else
+
 %files
 %endif
 %defattr(-, root, root)
diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec
index 55916fb..dda7854 100644
--- a/util-linux-systemd.spec
+++ b/util-linux-systemd.spec
@@ -370,6 +370,7 @@ Conflicts:      util-linux < 2.25
 
 %description systemd
 %else
+
 %description
 %endif
 This package contains low-level util-linux utilities that use systemd.
@@ -404,12 +405,14 @@ Group:          %group_pl
 
 %description -n python3-libmount
 %else
+
 %description
 %endif
 This package contains the Python bindings for util-linux libmount
 library.
 
 %endif
+
 %prep
 %setup -q -n %{_name}-%{version}
 cp -a %{S:2} .
@@ -866,6 +869,7 @@ done
 %if 0%{?suse_version} >= 1330
 %pre -n uuidd
 %else
+
 %pre -n uuidd
 getent group uuidd >/dev/null || /usr/sbin/groupadd -r uuidd
 getent passwd uuidd >/dev/null || \
@@ -1324,6 +1328,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %if %build_util_linux
 %files systemd
 %else
+
 %files
 %endif
 %defattr(-, root, root)
@@ -1374,6 +1379,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %if %build_util_linux
 %files -n python3-libmount
 %else
+
 %files
 %endif
 %defattr(-, root, root)
diff --git a/util-linux.changes b/util-linux.changes
index 5362af6..d905d7b 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 25 15:02:00 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
+
+- login.pamd: use pam_motd to unify motd handling [bsc#1185897].
+  Else motd snippets of e.g. cockpit will not be shown.
+
 -------------------------------------------------------------------
 Tue Feb 16 19:33:08 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
 
diff --git a/util-linux.spec b/util-linux.spec
index d838351..1b06957 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -370,6 +370,7 @@ Conflicts:      util-linux < 2.25
 
 %description systemd
 %else
+
 %description
 %endif
 This package contains low-level util-linux utilities that use systemd.
@@ -404,12 +405,14 @@ Group:          %group_pl
 
 %description -n python3-libmount
 %else
+
 %description
 %endif
 This package contains the Python bindings for util-linux libmount
 library.
 
 %endif
+
 %prep
 %setup -q -n %{_name}-%{version}
 cp -a %{S:2} .
@@ -866,6 +869,7 @@ done
 %if 0%{?suse_version} >= 1330
 %pre -n uuidd
 %else
+
 %pre -n uuidd
 getent group uuidd >/dev/null || /usr/sbin/groupadd -r uuidd
 getent passwd uuidd >/dev/null || \
@@ -1324,6 +1328,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %if %build_util_linux
 %files systemd
 %else
+
 %files
 %endif
 %defattr(-, root, root)
@@ -1374,6 +1379,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %if %build_util_linux
 %files -n python3-libmount
 %else
+
 %files
 %endif
 %defattr(-, root, root)