diff --git a/samba-4.12.0+git.135.dd3c974c75f.tar.bz2 b/samba-4.12.0+git.135.dd3c974c75f.tar.bz2
deleted file mode 100644
index f7c22a2..0000000
--- a/samba-4.12.0+git.135.dd3c974c75f.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6547e8208c0803be1359bcb0790ac5b59ccac40b81e72b1c99a4b762944d0ce
-size 24665102
diff --git a/samba-4.12.2+git.149.16ff41ef1f4.tar.bz2 b/samba-4.12.2+git.149.16ff41ef1f4.tar.bz2
new file mode 100644
index 0000000..6c7ebd8
--- /dev/null
+++ b/samba-4.12.2+git.149.16ff41ef1f4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f089f6fed9646f7405b66a306b5a12eab9cff6341167d29a76e03d31b2de461
+size 24685949
diff --git a/samba.changes b/samba.changes
index eb3afe1..0f7fbfa 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,49 @@
+-------------------------------------------------------------------
+Wed Apr 29 15:48:50 UTC 2020 - Noel Power <nopower@suse.com>
+
+- Move libdcerpc-server-core.so to samba-libs package, this was
+  initially erroneously located in  samba-ad-dc.
+
+-------------------------------------------------------------------
+Tue Apr 28 11:44:07 UTC 2020 - Noel Power <nopower@suse.com>
+
+- Update to samba 4.12.2
+  + CVE-2020-10700: A client combining the 'ASQ' and
+    'Paged Results' LDAP controls can cause a use-after-free
+    in Samba's AD DC LDAP server;(bso#14331); (bsc#1169850)
+  + CVE-2020-10704: A deeply nested filter in an un-authenticated
+    LDAP search can exhaust the LDAP server's stack memory causing
+    a SIGSEGV; (bso#14334); (bsc#1169851).
+
+-------------------------------------------------------------------
+Mon Apr 13 09:07:02 UTC 2020 - Samuel Cabrero <scabrero@suse.de>
+
+- Update to samba 4.12.1
+  + nmblib: Avoid undefined behaviour in handle_name_ptrs(); (bso#14295);
+  + samba-tool group: Handle group names with special chars correctly;
+    (bso#14296);
+  + Add missing check for DMAPI offline status in async DOS attributes;
+    (bso#14293);
+  + Starting ctdb node that was powered off hard before results in recovery
+    loop; (bso#14295);
+  + smbd: Ignore set NTACL requests which contain S-1-5-88 NFS ACEs;
+    (bso#14307);
+  + vfs_recycle: Prevent flooding the log if we're called on non-existant
+    paths; (bso#14316);
+  + librpc: Fix IDL for svcctl_ChangeServiceConfigW; (bso#14313);
+  + nsswitch: Fix use-after-free causing segfault in _pam_delete_cred;
+    (bso#14327);
+  + fruit:time machine max size is broken on arm; (bso#13622);
+  + CTDB recovery corner cases can cause record resurrection and node
+    banning; (bso#14294);
+  + s3/utils: Fix double free error with smbtree; (bso#14332);
+  + CTDB recovery corner cases can cause record resurrection and node
+    banning; (bso#14294);
+  + Starting ctdb node that was powered off hard before results in recovery
+    loop; (bso#14295);
+  + CTDB recovery daemon can crash due to dereference of NULL pointer;
+    (bso#14324);
+
 -------------------------------------------------------------------
 Wed Mar 25 12:52:55 UTC 2020 - Noel Power <nopower@suse.com>
 
diff --git a/samba.spec b/samba.spec
index 4de4f67..84cca46 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.1
+%define ldb_version    2.1.2
 
 %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.0+git.135.dd3c974c75f
+Version:        4.12.2+git.149.16ff41ef1f4
 Release:        0
 Url:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -1784,9 +1784,9 @@ exit 0
 %{_includedir}/samba
 %dir %_includedir/samba-4.0/
 %_includedir/samba-4.0/charset.h
+%_includedir/samba-4.0/dcesrv_core.h
 %if %{with_dc}
 %_includedir/samba-4.0/dcerpc_server.h
-%_includedir/samba-4.0/dcesrv_core.h
 %endif
 %dir %_includedir/samba-4.0/core/
 %_includedir/samba-4.0/core/doserr.h
@@ -1859,6 +1859,8 @@ exit 0
 %{_libdir}/samba/libdbwrap-samba4.so
 %{_libdir}/samba/libdcerpc-samba-samba4.so
 %{_libdir}/samba/libdcerpc-samba4.so
+%{_libdir}/libdcerpc-server-core.so.0
+%{_libdir}/libdcerpc-server-core.so.0.0.1
 %if %{with_dc}
 %{_libdir}/samba/libdb-glue-samba4.so
 %{_libdir}/samba/libdfs-server-ad-samba4.so
@@ -2182,12 +2184,11 @@ exit 0
 %_libdir/libdcerpc.so
 %_libdir/libdcerpc-binding.so
 %_libdir/pkgconfig/dcerpc.pc
+%_libdir/libdcerpc-server-core.so
 %if %{with_dc}
 %_libdir/libdcerpc-server.so
-%_libdir/libdcerpc-server-core.so
 %_libdir/pkgconfig/dcerpc_server.pc
 %endif
-
 %files -n libndr-krb5pac0
 %defattr(-,root,root)
 %_libdir/libndr-krb5pac.so.0*
@@ -2430,8 +2431,6 @@ exit 0
 %{_libdir}/krb5/plugins/kdb/samba.so
 %{_libdir}/libdcerpc-server.so.0
 %{_libdir}/libdcerpc-server.so.0.0.1
-%{_libdir}/libdcerpc-server-core.so.0
-%{_libdir}/libdcerpc-server-core.so.0.0.1
 %{_libdir}/samba/bind9
 %{_libdir}/samba/bind9/dlz_bind9.so
 %{_libdir}/samba/bind9/dlz_bind9_10.so