diff --git a/glibc.changes b/glibc.changes
index f4338b5..b9a7d0b 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct  9 08:50:18 UTC 2023 - Andreas Schwab <schwab@suse.de>
+
+- Add systemd also to gshadow lookups (jsc#PED-5188)
+- For SLE continue to use nsswitch.conf without systemd
+
 -------------------------------------------------------------------
 Wed Oct  4 09:31:09 UTC 2023 - Andreas Schwab <schwab@suse.de>
 
diff --git a/glibc.spec b/glibc.spec
index c2e7935..516d534 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -170,6 +170,7 @@ Source1:        https://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz.sig
 Source2:        http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=libc&download=1#/glibc.keyring
 Source4:        manpages.tar.bz2
 Source5:        nsswitch.conf
+Source6:        sle-nsswitch.conf
 Source7:        bindresvport.blacklist
 Source9:        glibc.rpmlintrc
 Source10:       baselibs.conf
@@ -957,7 +958,7 @@ install -m 644 %{SOURCE7} %{buildroot}/etc
 %if %suse_version > 1500
 install -D -m 644 %{SOURCE5} %{buildroot}%{_prefix}/etc/nsswitch.conf
 %else
-install -m 644 %{SOURCE5} %{buildroot}/etc
+install -m 644 %{SOURCE6} %{buildroot}/etc
 %endif
 
 %if %{build_html}
diff --git a/nsswitch.conf b/nsswitch.conf
index 149c359..939bc40 100644
--- a/nsswitch.conf
+++ b/nsswitch.conf
@@ -63,7 +63,7 @@ networks:	files dns
 
 aliases:	files usrfiles
 ethers:		files usrfiles
-gshadow:	files usrfiles
+gshadow:	files usrfiles systemd
 netgroup:	files nis
 protocols:	files usrfiles
 publickey:	files
diff --git a/sle-nsswitch.conf b/sle-nsswitch.conf
new file mode 100644
index 0000000..7e3ba34
--- /dev/null
+++ b/sle-nsswitch.conf
@@ -0,0 +1,75 @@
+#
+# /etc/nsswitch.conf
+#
+# An example Name Service Switch config file. This file should be
+# sorted with the most-used services at the beginning.
+#
+# Valid databases are: aliases, ethers, group, gshadow, hosts,
+# initgroups, netgroup, networks, passwd, protocols, publickey,
+# rpc, services, and shadow.
+#
+# Valid service provider entries include (in alphabetical order):
+#
+#	compat			Use /etc files plus *_compat pseudo-db
+#	db			Use the pre-processed /var/db files
+#	dns			Use DNS (Domain Name Service)
+#	files			Use the local files in /etc
+#	hesiod			Use Hesiod (DNS) for user lookups
+#	nis			Use NIS (NIS version 2), also called YP
+#	nisplus			Use NIS+ (NIS version 3)
+#
+# See `info libc 'NSS Basics'` for more information.
+#
+# Commonly used alternative service providers (may need installation):
+#
+#	ldap			Use LDAP directory server
+#	myhostname		Use systemd host names
+#	mymachines		Use systemd machine names
+#	mdns*, mdns*_minimal	Use Avahi mDNS/DNS-SD
+#	resolve			Use systemd resolved resolver
+#	sss			Use System Security Services Daemon (sssd)
+#	systemd			Use systemd for dynamic user option
+#	winbind			Use Samba winbind support
+#	wins			Use Samba wins support
+#	wrapper			Use wrapper module for testing
+#
+# Notes:
+#
+# 'sssd' performs its own 'files'-based caching, so it should generally
+# come before 'files'.
+#
+# WARNING: Running nscd with a secondary caching service like sssd may
+# 	   lead to unexpected behaviour, especially with how long
+# 	   entries are cached.
+#
+# Installation instructions:
+#
+# To use 'db', install the appropriate package(s) (provide 'makedb' and
+# libnss_db.so.*), and place the 'db' in front of 'files' for entries
+# you want to be looked up first in the databases, like this:
+#
+# passwd:    db files
+# shadow:    db files
+# group:     db files
+
+passwd:		compat
+group:		compat
+shadow:		compat
+# Allow initgroups to default to the setting for group.
+# initgroups:	compat
+
+hosts:  	files dns
+networks:	files dns
+
+aliases:	files usrfiles
+ethers:		files usrfiles
+gshadow:	files usrfiles
+netgroup:	files nis
+protocols:	files usrfiles
+publickey:	files
+rpc:		files usrfiles
+services:	files usrfiles
+
+automount:	files nis
+bootparams:	files
+netmasks:	files