diff --git a/glibc.changes b/glibc.changes
index 7dc494a..c59a978 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 28 18:46:30 UTC 2012 - aj@suse.de
+
+- Remove not anymore existing nscd.socket.
+
 -------------------------------------------------------------------
 Thu Jun 28 12:33:50 UTC 2012 - aj@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index ecc0995..2a78fdc 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1079,11 +1079,18 @@ done
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz
 
 %preun -n nscd
+
 %stop_on_removal nscd
 
 %post -n nscd
 %{insserv_force_if_yast nscd}
 mkdir -p /var/run/nscd
+# Previously we had nscd.socket, remove it
+test -x /usr/bin/systemctl && /usr/bin/systemctl stop nscd.socket || :
+test -x /usr/bin/systemctl && /usr/bin/systemctl disable nscd.socket || :
+# Hard removal in case the above did not work
+rm -f /etc/systemd/system/sockets.target.wants/nscd.socket
+exit 0
 
 %postun -n nscd
 %restart_on_update nscd