diff --git a/samba-4.21.0+git.363.84c94ca948f.tar.bz2 b/samba-4.21.0+git.363.84c94ca948f.tar.bz2
deleted file mode 100644
index b62c869..0000000
--- a/samba-4.21.0+git.363.84c94ca948f.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb350a01e48597efb6bcd661059ea6cc969900dfdcaf2499dd6cdd09af0f8e44
-size 45051548
diff --git a/samba-4.21.1+git.367.e1da597d86e.tar.bz2 b/samba-4.21.1+git.367.e1da597d86e.tar.bz2
new file mode 100644
index 0000000..b1158f3
--- /dev/null
+++ b/samba-4.21.1+git.367.e1da597d86e.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2190d21f6d13ee00cfbf0c8a2a2b93f6c4363ca3c25061b700a9a2d6d4c0be4f
+size 45089798
diff --git a/samba.changes b/samba.changes
index 7b02ee8..d0eb97a 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Wed Oct  16 13:52:25 UTC 2024 - Noel Power <nopower@suse.com>
+
+-  Adjust spec to split out rpcd_* binaries into a separate
+   sub package; (bsc#1231414).
+
+-------------------------------------------------------------------
+Tue Oct 15 13:23:26 UTC 2024 - Noel Power <nopower@suse.com>
+
+- Update to 4.21.1
+  * DH reconnect error handling can lead to stale sharemode
+    entries; (bso#15624).
+  * "inherit permissions = yes" triggers assert() in vfs_default
+    when creating a stream; (bso#15695).
+  * Samba 4.21.0 broke FreeIPA domain member integration;
+    (bso#15715).
+  * Missing conversion for msDS-UserTGTLifetime, msDS-
+    ComputerTGTLifetime and msDS-ServiceTGTLifetime on "samba-
+    tool domain auth policy modify"; (bso#15692).
+  * irpc_destructor may crash during shutdown; (bso#15280).
+  * Durable handle is not granted when a previous OPEN exists
+    with NoOplock; (bso#15649).
+  * Durable handle is granted but reconnect fails; (bso#15651).
+  * Disconnected durable handles with RH lease should not be
+    purged by a new non conflicting open; (bso#15708).
+  * net ads testjoin and other commands use the wrong secrets.tdb
+    in a cluster; (bso#15714).
+  * 4.21 using --with-system-mitkrb5 requires MIT krb5 1.16 as
+    rfc 8009 etypes are used; (bso#15726).
+  * VFS_OPEN_HOW_WITH_BACKUP_INTENT breaks shadow_copy2;
+    (bso#15730).
+  * Samba 4.20.0 DLZ module crashes BIND on startup; (bso#15643).
+  * Cannot build libldb lmdb backend on a build without AD DC;
+    (bso#15721).
+  * Consistent log level for sighup handler; (bso#15706).
+
 -------------------------------------------------------------------
 Wed Sep 25 14:52:10 UTC 2024 - Noel Power <nopower@suse.com>
 
diff --git a/samba.spec b/samba.spec
index c6d511c..c4dc729 100644
--- a/samba.spec
+++ b/samba.spec
@@ -169,7 +169,7 @@ BuildRequires:  liburing-devel
 %endif
 BuildRequires:  sysuser-tools
 
-Version:        4.21.0+git.363.84c94ca948f
+Version:        4.21.1+git.367.e1da597d86e
 Release:        0
 URL:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -187,6 +187,7 @@ Requires:       coreutils
 Requires:       system-user-nobody
 Requires:       %{fillup_prereq}
 Requires:       samba-client >= %{version}
+Requires:       samba-dcerpc = %{version}
 Requires:       sysuser-shadow
 Provides:       group(ntadmin)
 
@@ -463,6 +464,7 @@ Recommends:     logrotate
 Requires:       coreutils
 Requires:       samba-client = %{version}
 Requires:       samba-winbind-libs = %{version}
+Requires:       samba-dcerpc = %{version}
 Recommends:     samba-gpupdate = %{version}
 Requires:       sysuser-shadow
 
@@ -484,6 +486,14 @@ Requires(postun):/sbin/ldconfig
 %description winbind-libs
 This package contains the libraries required by the Winbind daemon.
 
+%package dcerpc
+Summary:	Samba dcerpc service binaries
+License:        GPL-3.0-or-later
+Group:          System/Daemons
+
+%description dcerpc
+This packages contains the binaries for the DCE/RPC endpoint servers.
+
 %package -n ctdb
 Summary:        Clustered TDB
 License:        GPL-3.0-or-later
@@ -1190,16 +1200,8 @@ exit 0
 %{_sbindir}/rcnmb
 %{_sbindir}/rcsmb
 %{_sbindir}/smbd
-%{_libdir}/samba/rpcd_classic
-%{_libdir}/samba/rpcd_epmapper
-%{_libdir}/samba/rpcd_fsrvp
-%{_libdir}/samba/rpcd_lsad
-%{_libdir}/samba/rpcd_mdssvc
-%{_libdir}/samba/rpcd_spoolss
-%{_libdir}/samba/rpcd_winreg
-%{_libdir}/samba/rpcd_witness
+
 %{_libdir}/samba/samba-bgqd
-%{_libdir}/samba/samba-dcerpcd
 %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/nmb.xml
 %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smb.xml
 %dir %{_datadir}/samba
@@ -1210,7 +1212,6 @@ exit 0
 %{_mandir}/man8/nmbd.8.*
 %{_mandir}/man8/smbd.8.*
 %{_mandir}/man8/samba-bgqd.8.*
-%{_mandir}/man8/samba-dcerpcd.8.*
 %{_fillupdir}/sysconfig.samba
 %{_sysusersdir}/samba.conf
 
@@ -1662,6 +1663,19 @@ exit 0
 %{_mandir}/man8/winbind_krb5_localauth.8.*
 %endif
 
+%files dcerpc
+%defattr(-,root,root)
+%{_libdir}/samba/rpcd_classic
+%{_libdir}/samba/rpcd_epmapper
+%{_libdir}/samba/rpcd_fsrvp
+%{_libdir}/samba/rpcd_lsad
+%{_libdir}/samba/rpcd_mdssvc
+%{_libdir}/samba/rpcd_spoolss
+%{_libdir}/samba/rpcd_winreg
+%{_libdir}/samba/rpcd_witness
+%{_libdir}/samba/samba-dcerpcd
+%{_mandir}/man8/samba-dcerpcd.8.*
+
 %files winbind -f filelist-samba-winbind
 %defattr(-,root,root)
 %config(noreplace) %_pam_secconfdir/pam_winbind.conf