diff --git a/samba-4.18.5+git.313.c8e274c7852.tar.bz2 b/samba-4.18.5+git.313.c8e274c7852.tar.bz2
deleted file mode 100644
index e7f9e76..0000000
--- a/samba-4.18.5+git.313.c8e274c7852.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e2b22fdd852c3eaca621bb40797004c9802cd6b4a9f80b13bd15e1631db13b2
-size 43711562
diff --git a/samba-4.18.6+git.320.cfda27bacb.tar.bz2 b/samba-4.18.6+git.320.cfda27bacb.tar.bz2
new file mode 100644
index 0000000..90dcb4d
--- /dev/null
+++ b/samba-4.18.6+git.320.cfda27bacb.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:161380f6945454dd99ae79f2207c64d6ddc4166a6bc21a5d125f9052a6612cd6
+size 43809240
diff --git a/samba.changes b/samba.changes
index 4e314da..8e84a21 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Mon Aug 21 15:16:35 UTC 2023 - Samuel Cabrero <scabrero@suse.de>
+
+- Update to 4.18.6
+  * reply_sesssetup_and_X() can dereference uninitialized tmp pointer;
+    (bso#15420);
+  * Missing return in reply_exit_done(); (bso#15430);
+  * post-exec password redaction for samba-tool is more reliable for fully
+    random passwords as it no longer uses regular expressions containing the
+    password value itself; (bso#15289);
+  * Windows client join fails if a second container CN=System exists somewhere;
+    (bso#9959);
+  * Spotlight sometimes returns no results on latest macOS; (bso#15342);
+  * Renaming results in NT_STATUS_SHARING_VIOLATION if previously attempted to
+    remove the destination; (bso#15417);
+  * Spotlight results return wrong date in result list; (bso#15427);
+  * "net offlinejoin provision" does not work as non-root user; (bso#15414);
+  * rpcserver no longer accepts double backslash in dfs pathname; (bso#15400);
+  * cm_prepare_connection() calls close(fd) for the second time; (bso#15433);
+  * 2-3min delays at reconnect with smb2_validate_sequence_number: bad
+    message_id 2; (bso#15346);
+  * samba-tool ntacl get segfault if aio_pthread appended; (bso#15441);
+  * DCERPC_PKT_CO_CANCEL and DCERPC_PKT_ORPHANED can't be parsed; (bso#15446);
+  * Python tarfile extraction needs change to avoid a warning (CVE-2007-4559
+    mitigation); (bso#15390);
+  * Regression DFS not working with widelinks = true; (bso#15435);
+  * mdssvc: Do an early talloc_free() in _mdssvc_open(); (bso#15449);
+
+-------------------------------------------------------------------
+Tue Aug  8 15:40:54 UTC 2023 - Samuel Cabrero <scabrero@suse.de>
+
+- Move libcluster-samba4.so from samba-libs to samba-client-libs;
+  (bsc#1213940);
+
 -------------------------------------------------------------------
 Wed Jul 19 14:35:34 UTC 2023 - Noel Power <nopower@suse.com>
 
diff --git a/samba.spec b/samba.spec
index fd3f9a9..50028d6 100644
--- a/samba.spec
+++ b/samba.spec
@@ -158,7 +158,7 @@ BuildRequires:  liburing-devel
 %endif
 BuildRequires:  sysuser-tools
 
-Version:        4.18.5+git.313.c8e274c7852
+Version:        4.18.6+git.320.cfda27bacb
 Release:        0
 URL:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -604,10 +604,7 @@ LDB library.
 %setup -n samba-%{version} -q
 # Create and add vendor suffix
 if test "%{_project}" != "openSUSE:Factory"; then
-	vendor_tag_release=$( grep -m 1 ^Release: %{_sourcedir}/samba.spec | \
-		while read tag release; do \
-			echo -n "${release:+${release}-}"; \
-		done)
+	vendor_tag_release="%{release}"
 else
 	vendor_tag_release=""
 fi
@@ -1429,6 +1426,7 @@ exit 0
 %{_libdir}/samba/libcli-spoolss-samba4.so
 %{_libdir}/samba/libcliauth-samba4.so
 %{_libdir}/samba/libclidns-samba4.so
+%{_libdir}/samba/libcluster-samba4.so
 %{_libdir}/samba/libcmdline-contexts-samba4.so
 %{_libdir}/samba/libcmdline-samba4.so
 %{_libdir}/samba/libcommon-auth-samba4.so
@@ -1506,7 +1504,6 @@ exit 0
 %{_libdir}/samba/libLIBWBCLIENT-OLD-samba4.so
 %{_libdir}/samba/libauth4-samba4.so
 %{_libdir}/samba/libauth-unix-token-samba4.so
-%{_libdir}/samba/libcluster-samba4.so
 %{_libdir}/samba/libdnsserver-common-samba4.so
 %{_libdir}/samba/libgpext-samba4.so
 %{_libdir}/samba/libposix-eadb-samba4.so