diff --git a/samba-4.21.3+git.385.dab50f14578.tar.bz2 b/samba-4.21.3+git.385.dab50f14578.tar.bz2
deleted file mode 100644
index d7719b1..0000000
--- a/samba-4.21.3+git.385.dab50f14578.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8d5edf96ac4f0e8d3dc3197d66d61fd51a837077d17adaceb28f89da7fb12de2
-size 45030987
diff --git a/samba-4.21.4+git.390.43d401e5b77.tar.bz2 b/samba-4.21.4+git.390.43d401e5b77.tar.bz2
new file mode 100644
index 0000000..6b35b9b
--- /dev/null
+++ b/samba-4.21.4+git.390.43d401e5b77.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d21b5120c6c78752e688c8a5eb12609fe6ab0cd235c207212b7bf91de918e907
+size 45104877
diff --git a/samba.changes b/samba.changes
index 2941ffa..f188dbf 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Tue Feb 19 10:42:17 UTC 2025 - Samuel Cabrero <scabrero@suse.de>
+
+- Remove nscd build dependency and usage in RPM scriptlets;
+  (bsc#1237296);
+
+-------------------------------------------------------------------
+Wed Feb 19 10:08:34 UTC 2025 - Noel Power <nopower@suse.com>
+
+- Update to 4.21.4
+  * Increasing slowness of sharesec performance with high number
+    of registry shares; (bso#15780).
+  * winbindd shows memleak in kerberos_decode_pac; (bso#15782).
+  * Creation of GPOs applicable to more than one group is
+    impossible with Samba 4.20.0 and later; (bso#15738).
+  * Replace `crypt` module in
+    python/samba/netcmd/user/readpasswords/common.py;
+    (bso#15756).
+  * vfs_gpfs silently garbles timestamps > year 2106;
+    (bso#15151).
+  * Spotlight search results don't show file size and creation
+    date; (bso#15796).
+  * General improvements for vfs_ceph_new module; (bso#15703).
+  * net offlinejoin not working correctly; (bso#15777).
+  * net ads create/join/winbind producing unix dysfunctional
+    keytabs; (bso#15759).
+  * Windows Explorer crashes on S-1-22-* Unix-SIDs when accessing
+    security tab; (bso#14213).
+  * The values from hresult_errstr_const and hresult_errstr are
+    reversed in 4.20 and 4.21; (bso#15769).
+  * Kerberos referral tickets are generated for principals in our
+    domain if we have a trust to a top level domain; (bso#15778).
+  * NETLOGON_NTLMV2_ENABLED is missing in the SamLogon*
+    user_flags field; (bso#15783).
+  * Regression: stack-use-after-return in crypt_as_best_we_can();
+    (bso#15784).
+  * libreplace:readline: gcc 15 complains about incompatible
+    pointer types; (bso#15788).
+
 -------------------------------------------------------------------
 Tue Jan  7 10:22:16 UTC 2025 - Noel Power <nopower@suse.com>
 
diff --git a/samba.spec b/samba.spec
index c49ffc1..5e74293 100644
--- a/samba.spec
+++ b/samba.spec
@@ -97,7 +97,6 @@ BuildRequires:  gdbm-devel
 BuildRequires:  keyutils-devel
 BuildRequires:  flex
 BuildRequires:  bison
-BuildRequires:  libnscd-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libtirpc-devel
@@ -169,7 +168,7 @@ BuildRequires:  liburing-devel
 %endif
 BuildRequires:  sysuser-tools
 
-Version:        4.21.3+git.385.dab50f14578
+Version:        4.21.4+git.390.43d401e5b77
 Release:        0
 URL:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -458,7 +457,6 @@ Obsoletes:      samba-gplv3-winbind < %{version}
 Provides:       samba-client:/usr/sbin/winbindd
 Provides:       group(winbind)
 Requires:       pam-config
-Recommends:     /usr/sbin/nscd
 Recommends:     cron
 Recommends:     logrotate
 Requires:       coreutils
@@ -1112,10 +1110,6 @@ done
 /sbin/ldconfig
 if [ $1 -eq 0 ]; then
 %{_sbindir}/pam-config --delete --winbind
-if [ -x %{_sbindir}/nscd ]; then
-	%{_sbindir}/nscd -i passwd
-	%{_sbindir}/nscd -i group
-fi
 fi
 %service_del_postun winbind.service
 
@@ -1469,6 +1463,7 @@ exit 0
 %{_libdir}/samba/libads-private-samba.so
 %{_libdir}/samba/libasn1util-private-samba.so
 %{_libdir}/samba/libauth-private-samba.so
+%{_libdir}/samba/libutil-crypt-private-samba.so
 %if %{with_dc}
 %{_libdir}/samba/libauthn-policy-util-private-samba.so
 %endif