diff --git a/shadow-login_defs-suse.patch b/shadow-login_defs-suse.patch
index ea0191d..13ed873 100644
--- a/shadow-login_defs-suse.patch
+++ b/shadow-login_defs-suse.patch
@@ -20,7 +20,7 @@ Index: etc/login.defs
  #
 -MOTD_FILE	/etc/motd
 -#MOTD_FILE	/etc/motd:/usr/lib/news/news-motd
-+MOTD_FILE
++MOTD_FILE	""
 +#MOTD_FILE	/etc/motd:/usr/share/misc/motd
  
  #
diff --git a/shadow.changes b/shadow.changes
index 6699bf8..aa085fd 100644
--- a/shadow.changes
+++ b/shadow.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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>
 
diff --git a/shadow.spec b/shadow.spec
index 8faa3e2..7786747 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -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