diff --git a/samba-4.12.3+git.161.208cf9730ee.tar.bz2 b/samba-4.12.3+git.161.208cf9730ee.tar.bz2
deleted file mode 100644
index 3c4d271..0000000
--- a/samba-4.12.3+git.161.208cf9730ee.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d2363da816b576ed322769e1e90455a7d49deaac23bceb8336e9b0314759fde7
-size 24739936
diff --git a/samba-4.12.5+git.168.88cc07e6cbf.tar.bz2 b/samba-4.12.5+git.168.88cc07e6cbf.tar.bz2
new file mode 100644
index 0000000..a9b7d66
--- /dev/null
+++ b/samba-4.12.5+git.168.88cc07e6cbf.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0fe88be82ef3a77979929f334be2a1315375b26f4ed107497f5262cfb16806a7
+size 24787220
diff --git a/samba.changes b/samba.changes
index f310008..dfc7591 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Thu Jul  2 15:18:42 UTC 2020 - Noel Power <nopower@suse.com>
+
+- Update to samba 4.12.5
+  + Fix smbd panic on force-close share during async
+    io; (bso#14301).
+  + Fix segfault when using SMBC_opendir_ctx() routine for
+    share folder that contains incorrect symbols in any
+    file name; (bso#14374)
+  + Fix DFS links; (bso#14391).
+  + Can't use DNS functionality after a Windows DC has been
+    in domain; (bso#14310).
+  + ldapi search to FreeIPA crashes; (bso#14413).
+  + Add net-ads-join dnshostname=fqdn option; (bso#14396)
+  + Fix adding msDS-AdditionalDnsHostName to keytab with
+    Windows DC; (bso#14406).
+  + docs-xml: Update list of posible VFS operations for
+    vfs_full_audit; (bso#14386).
+  + winbindd: Fix a use-after-free when winbind clients exit;
+    (bso#14382).
+  + Client tools are not able to read gencache anymore;
+    (bso#14370).
+
+-------------------------------------------------------------------
+Thu Jul  2 11:56:15 UTC 2020 - Noel Power <nopower@suse.com>
+
+- Update to samba 4.12.4
+  + CVE-2020-10730: NULL de-reference in AD DC LDAP server when
+    ASQ and VLV combined; (bso#14364); (bsc#1173159)
+  + CVE-2020-10745: invalid DNS or NBT queries containing dots use
+    several seconds of CPU each; (bso#14378); (bsc#1173160).
+  + CVE-2020-10760: Use-after-free in AD DC Global Catalog LDAP
+    server with paged_result or VLV; (bso#14402); (bsc#1173161)
+  + CVE-2020-14303: Endless loop from empty UDP packet sent to
+    AD DC nbt_server; (bso#14417); (bsc#1173359).
+
 -------------------------------------------------------------------
 Sat May 30 15:42:34 UTC 2020 - Marcus Meissner <meissner@suse.com>
 
diff --git a/samba.spec b/samba.spec
index 603dc07..de8401e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -53,7 +53,7 @@
 %define talloc_version 2.3.1
 %define tevent_version 0.10.2
 %define tdb_version    1.4.3
-%define ldb_version    2.1.3
+%define ldb_version    2.1.4
 
 %global with_mitkrb5 1
 %global with_dc 0
@@ -164,7 +164,7 @@ BuildRequires:  libtasn1-devel >= 3.8
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        4.12.3+git.161.208cf9730ee
+Version:        4.12.5+git.168.88cc07e6cbf
 Release:        0
 Url:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}