diff --git a/shadow-login_defs-suse.patch b/shadow-login_defs-suse.patch
index db3c694..13ed873 100644
--- a/shadow-login_defs-suse.patch
+++ b/shadow-login_defs-suse.patch
@@ -14,12 +14,13 @@ Index: etc/login.defs
  
  #
  # Delay in seconds before being allowed another attempt after a login failure
-@@ -62,8 +65,7 @@ CONSOLE		/etc/securetty
+@@ -62,8 +65,8 @@ CONSOLE		/etc/securetty
  # If defined, ":" delimited list of "message of the day" files to
  # be displayed upon login.
  #
 -MOTD_FILE	/etc/motd
 -#MOTD_FILE	/etc/motd:/usr/lib/news/news-motd
++MOTD_FILE	""
 +#MOTD_FILE	/etc/motd:/usr/share/misc/motd
  
  #
diff --git a/shadow.changes b/shadow.changes
index 85095e8..aa085fd 100644
--- a/shadow.changes
+++ b/shadow.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Thu Jul  1 11:51:39 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
+
+- login.defs/MOTD_FILE: Use "" instead of blank entry [bsc#1187536]
+- Add /etc/login.defs.d directory
+
+-------------------------------------------------------------------
+Sat Jun  5 13:38:52 UTC 2021 - Maurizio Galli <maurizio.galli@gmail.com>
+
+- Enable shadowgrp so that we can set more secure group passwords 
+  using shadow.
+
+-------------------------------------------------------------------
+Fri Jun  4 07:46:34 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
+
+- Disable MOTD_FILE to allow the use of pam_motd to unify motd
+  message output [bsc#1185897]. Else motd entries of e.g. cockpit
+  will not be shown.
+
 -------------------------------------------------------------------
 Thu Jan 28 22:28:02 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
 
diff --git a/shadow.spec b/shadow.spec
index 352fd50..7786747 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -135,7 +135,7 @@ export LDFLAGS="-pie"
 
 autoreconf -fvi
 %configure \
-  --disable-shadowgrp \
+  --enable-shadowgrp \
   --enable-account-tools-setuid \
   --with-audit \
   --with-libpam \
@@ -225,6 +225,7 @@ rm -rf %{buildroot}%{_mandir}/{??,??_??}
 if [ ! -d %{buildroot}%{_distconfdir} ]; then
     mkdir -p %{buildroot}%{_distconfdir}
     mv %{buildroot}%{_sysconfdir}/{login.defs,pam.d} %{buildroot}%{_distconfdir}
+    mkdir -p %{buildroot}%{_sysconfdir}/login.defs.d
 fi
 
 %find_lang shadow
@@ -379,6 +380,7 @@ test -f /etc/login.defs.rpmsave && mv -v /etc/login.defs.rpmsave /etc/login.defs
 
 %files -n login_defs
 %if %{defined no_config}
+%dir /etc/login.defs.d
 %attr(0644,root,root) %{_distconfdir}/login.defs
 %else
 %attr(0644,root,root) %config %{_sysconfdir}/login.defs