diff --git a/python3-libmount.changes b/python3-libmount.changes
index 5362af6..d905d7b 100644
--- a/python3-libmount.changes
+++ b/python3-libmount.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/python3-libmount.spec b/python3-libmount.spec
index d7aa86f..ecb625b 100644
--- a/python3-libmount.spec
+++ b/python3-libmount.spec
@@ -653,41 +653,15 @@ install -m 644 runuser.default %{buildroot}%{_distconfdir}/default/runuser
 rm -f %{buildroot}%{python3_sitearch}/libmount/*.*a
 %if %build_util_linux
 %if !0%{?usrmerged}
-ln -s %{_bindir}/kill %{buildroot}/bin
-ln -s %{_bindir}/su %{buildroot}/bin
-ln -s %{_bindir}/dmesg %{buildroot}/bin
-ln -s %{_bindir}/more %{buildroot}/bin
-ln -s %{_bindir}/mount %{buildroot}/bin
-ln -s %{_bindir}/umount %{buildroot}/bin
-ln -s %{_sbindir}/agetty %{buildroot}/sbin
-ln -s %{_sbindir}/blockdev %{buildroot}/sbin
-ln -s %{_sbindir}/cfdisk %{buildroot}/sbin
-ln -s %{_sbindir}/ctrlaltdel %{buildroot}/sbin
-ln -s %{_sbindir}/fdisk %{buildroot}/sbin
-ln -s %{_sbindir}/fsck.minix %{buildroot}/sbin
-ln -s %{_sbindir}/fsck.cramfs %{buildroot}/sbin
-ln -s %{_sbindir}/hwclock %{buildroot}/sbin
-ln -s %{_sbindir}/losetup %{buildroot}/sbin
-ln -s %{_sbindir}/mkfs %{buildroot}/sbin
-ln -s %{_sbindir}/mkfs.bfs %{buildroot}/sbin
-ln -s %{_sbindir}/mkfs.minix %{buildroot}/sbin
-ln -s %{_sbindir}/mkfs.cramfs %{buildroot}/sbin
-ln -s %{_sbindir}/mkswap %{buildroot}/sbin
-ln -s %{_sbindir}/nologin %{buildroot}/sbin
-ln -s %{_sbindir}/pivot_root %{buildroot}/sbin
-ln -s %{_sbindir}/raw %{buildroot}/sbin
-ln -s %{_sbindir}/sfdisk %{buildroot}/sbin
-ln -s %{_sbindir}/swapoff %{buildroot}/sbin
-ln -s %{_sbindir}/swapon %{buildroot}/sbin
-ln -s %{_sbindir}/blkid %{buildroot}/sbin
-ln -s %{_sbindir}/findfs %{buildroot}/sbin
-ln -s %{_sbindir}/fsck %{buildroot}/sbin
-ln -s %{_sbindir}/switch_root %{buildroot}/sbin
-ln -s %{_sbindir}/wipefs %{buildroot}/sbin
-ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin
-ln -s %{_sbindir}/swaplabel %{buildroot}/sbin
-ln -s %{_sbindir}/fstrim %{buildroot}/sbin
-ln -s %{_sbindir}/chcpu %{buildroot}/sbin
+for i in kill su dmesg more mount umount; do
+	ln -s "%{_bindir}/$i" "%{buildroot}/bin/"
+done
+for i in agetty blockdev cfdisk ctrlaltdel fdisk fsck.minix fsck.cramfs \
+    hwclock losetup mkfs mkfs.bfs mkfs.minix mkfs.cramfs mkswap nologin \
+    pivot_root raw sfdisk swapoff swapon blkid findfs fsck switch_root \
+    wipefs fsfreeze swaplabel fstrim chcpu; do
+	ln -s "%{_sbindir}/$i" "%{buildroot}/sbin/"
+done
 %endif
 install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems
 echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb
diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes
index 5362af6..d905d7b 100644
--- a/util-linux-systemd.changes
+++ b/util-linux-systemd.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-systemd.spec b/util-linux-systemd.spec
index dda7854..b5acf8f 100644
--- a/util-linux-systemd.spec
+++ b/util-linux-systemd.spec
@@ -653,41 +653,15 @@ install -m 644 runuser.default %{buildroot}%{_distconfdir}/default/runuser
 rm -f %{buildroot}%{python3_sitearch}/libmount/*.*a
 %if %build_util_linux
 %if !0%{?usrmerged}
-ln -s %{_bindir}/kill %{buildroot}/bin
-ln -s %{_bindir}/su %{buildroot}/bin
-ln -s %{_bindir}/dmesg %{buildroot}/bin
-ln -s %{_bindir}/more %{buildroot}/bin
-ln -s %{_bindir}/mount %{buildroot}/bin
-ln -s %{_bindir}/umount %{buildroot}/bin
-ln -s %{_sbindir}/agetty %{buildroot}/sbin
-ln -s %{_sbindir}/blockdev %{buildroot}/sbin
-ln -s %{_sbindir}/cfdisk %{buildroot}/sbin
-ln -s %{_sbindir}/ctrlaltdel %{buildroot}/sbin
-ln -s %{_sbindir}/fdisk %{buildroot}/sbin
-ln -s %{_sbindir}/fsck.minix %{buildroot}/sbin
-ln -s %{_sbindir}/fsck.cramfs %{buildroot}/sbin
-ln -s %{_sbindir}/hwclock %{buildroot}/sbin
-ln -s %{_sbindir}/losetup %{buildroot}/sbin
-ln -s %{_sbindir}/mkfs %{buildroot}/sbin
-ln -s %{_sbindir}/mkfs.bfs %{buildroot}/sbin
-ln -s %{_sbindir}/mkfs.minix %{buildroot}/sbin
-ln -s %{_sbindir}/mkfs.cramfs %{buildroot}/sbin
-ln -s %{_sbindir}/mkswap %{buildroot}/sbin
-ln -s %{_sbindir}/nologin %{buildroot}/sbin
-ln -s %{_sbindir}/pivot_root %{buildroot}/sbin
-ln -s %{_sbindir}/raw %{buildroot}/sbin
-ln -s %{_sbindir}/sfdisk %{buildroot}/sbin
-ln -s %{_sbindir}/swapoff %{buildroot}/sbin
-ln -s %{_sbindir}/swapon %{buildroot}/sbin
-ln -s %{_sbindir}/blkid %{buildroot}/sbin
-ln -s %{_sbindir}/findfs %{buildroot}/sbin
-ln -s %{_sbindir}/fsck %{buildroot}/sbin
-ln -s %{_sbindir}/switch_root %{buildroot}/sbin
-ln -s %{_sbindir}/wipefs %{buildroot}/sbin
-ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin
-ln -s %{_sbindir}/swaplabel %{buildroot}/sbin
-ln -s %{_sbindir}/fstrim %{buildroot}/sbin
-ln -s %{_sbindir}/chcpu %{buildroot}/sbin
+for i in kill su dmesg more mount umount; do
+	ln -s "%{_bindir}/$i" "%{buildroot}/bin/"
+done
+for i in agetty blockdev cfdisk ctrlaltdel fdisk fsck.minix fsck.cramfs \
+    hwclock losetup mkfs mkfs.bfs mkfs.minix mkfs.cramfs mkswap nologin \
+    pivot_root raw sfdisk swapoff swapon blkid findfs fsck switch_root \
+    wipefs fsfreeze swaplabel fstrim chcpu; do
+	ln -s "%{_sbindir}/$i" "%{buildroot}/sbin/"
+done
 %endif
 install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems
 echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb
diff --git a/util-linux.spec b/util-linux.spec
index 1b06957..e2ff0f3 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -653,41 +653,15 @@ install -m 644 runuser.default %{buildroot}%{_distconfdir}/default/runuser
 rm -f %{buildroot}%{python3_sitearch}/libmount/*.*a
 %if %build_util_linux
 %if !0%{?usrmerged}
-ln -s %{_bindir}/kill %{buildroot}/bin
-ln -s %{_bindir}/su %{buildroot}/bin
-ln -s %{_bindir}/dmesg %{buildroot}/bin
-ln -s %{_bindir}/more %{buildroot}/bin
-ln -s %{_bindir}/mount %{buildroot}/bin
-ln -s %{_bindir}/umount %{buildroot}/bin
-ln -s %{_sbindir}/agetty %{buildroot}/sbin
-ln -s %{_sbindir}/blockdev %{buildroot}/sbin
-ln -s %{_sbindir}/cfdisk %{buildroot}/sbin
-ln -s %{_sbindir}/ctrlaltdel %{buildroot}/sbin
-ln -s %{_sbindir}/fdisk %{buildroot}/sbin
-ln -s %{_sbindir}/fsck.minix %{buildroot}/sbin
-ln -s %{_sbindir}/fsck.cramfs %{buildroot}/sbin
-ln -s %{_sbindir}/hwclock %{buildroot}/sbin
-ln -s %{_sbindir}/losetup %{buildroot}/sbin
-ln -s %{_sbindir}/mkfs %{buildroot}/sbin
-ln -s %{_sbindir}/mkfs.bfs %{buildroot}/sbin
-ln -s %{_sbindir}/mkfs.minix %{buildroot}/sbin
-ln -s %{_sbindir}/mkfs.cramfs %{buildroot}/sbin
-ln -s %{_sbindir}/mkswap %{buildroot}/sbin
-ln -s %{_sbindir}/nologin %{buildroot}/sbin
-ln -s %{_sbindir}/pivot_root %{buildroot}/sbin
-ln -s %{_sbindir}/raw %{buildroot}/sbin
-ln -s %{_sbindir}/sfdisk %{buildroot}/sbin
-ln -s %{_sbindir}/swapoff %{buildroot}/sbin
-ln -s %{_sbindir}/swapon %{buildroot}/sbin
-ln -s %{_sbindir}/blkid %{buildroot}/sbin
-ln -s %{_sbindir}/findfs %{buildroot}/sbin
-ln -s %{_sbindir}/fsck %{buildroot}/sbin
-ln -s %{_sbindir}/switch_root %{buildroot}/sbin
-ln -s %{_sbindir}/wipefs %{buildroot}/sbin
-ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin
-ln -s %{_sbindir}/swaplabel %{buildroot}/sbin
-ln -s %{_sbindir}/fstrim %{buildroot}/sbin
-ln -s %{_sbindir}/chcpu %{buildroot}/sbin
+for i in kill su dmesg more mount umount; do
+	ln -s "%{_bindir}/$i" "%{buildroot}/bin/"
+done
+for i in agetty blockdev cfdisk ctrlaltdel fdisk fsck.minix fsck.cramfs \
+    hwclock losetup mkfs mkfs.bfs mkfs.minix mkfs.cramfs mkswap nologin \
+    pivot_root raw sfdisk swapoff swapon blkid findfs fsck switch_root \
+    wipefs fsfreeze swaplabel fstrim chcpu; do
+	ln -s "%{_sbindir}/$i" "%{buildroot}/sbin/"
+done
 %endif
 install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems
 echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb