diff --git a/baselibs.conf b/baselibs.conf
index 1a56bdf..7808972 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -12,6 +12,7 @@ libregistry0
 libsamba-credentials0
 libsamba-hostconfig0
 libsamba-passdb0
+  obsoletes "libpdb0-<targettype> < <version>"
 libsamba-policy0
 libsamba-util0
 libsamdb0
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 37f0942..bb31284 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f41b1ca9ba6ac11db93bf35ee0be2b4951c6ab3828d6177c48c091d672134eb6
-size 29304
+oid sha256:8874bbeaca36120dfcf5ee0edc9f8b80217291f128cc6f503051d0faf3021321
+size 29242
diff --git a/samba.changes b/samba.changes
index e61e0a7..5a40f95 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Sep 25 15:23:47 UTC 2015 - lmuelle@suse.com
+
+- Relocate the tmpfiles.d directory to the client package; (bnc#947552).
+
+-------------------------------------------------------------------
+Tue Sep 22 13:13:02 UTC 2015 - lmuelle@suse.com
+
+- Do not provide libpdb0 from libsamba-passdb0 but add it to baselibs.conf
+  instead; (bnc#942716).
+
 -------------------------------------------------------------------
 Wed Sep 16 13:06:36 UTC 2015 - lmuelle@suse.com
 
@@ -6,7 +17,7 @@ Wed Sep 16 13:06:36 UTC 2015 - lmuelle@suse.com
 -------------------------------------------------------------------
 Fri Sep 11 15:53:45 UTC 2015 - lmuelle@suse.com
 
-- Package /var/lib/samba/msg with 0755 permissions; (bnc#945502).
+- Package /var/lib/samba/msg with 0755 permissions; (bso#11515); (bnc#945502).
 
 -------------------------------------------------------------------
 Wed Sep  9 10:57:52 UTC 2015 - lmuelle@suse.com
diff --git a/samba.spec b/samba.spec
index 1b16c94..016ca6e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -144,7 +144,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3485
+%define SOURCE_TIMESTAMP 3499
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -153,7 +153,6 @@ Release:        0
 Url:            http://www.samba.org/
 Provides:       samba-gplv3 = %{version}
 Obsoletes:      samba-gplv3 < %{version}
-Requires:       samba-client >= %{version}
 %if 0%{?suse_version} > 1030
 Recommends:     cron
 Recommends:     logrotate
@@ -175,6 +174,7 @@ PreReq:         grep
 %if 0%{?suse_version} > 1220
 PreReq:         %{fillup_prereq}
 %endif
+PreReq:         samba-client >= %{version}
 # Choose some features / extra packages here
 ############################################
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
@@ -420,7 +420,6 @@ Provides:       samba-gplv3-winbind = %{version}
 Obsoletes:      samba-gplv3-winbind < %{version}
 Provides:       samba-client:/usr/sbin/winbindd
 Requires:       %{libwbclient_name} = %{version}-%{release}
-Requires:       samba-client >= %{version}
 %if 0%{?suse_version}
 Requires:       pam-config
 %endif
@@ -435,6 +434,7 @@ PreReq:         %{?insserv_prereq}
 PreReq:         /sbin/ldconfig
 PreReq:         /usr/sbin/groupadd
 PreReq:         coreutils
+PreReq:         samba-client >= %{version}
 
 %description winbind
 This is the winbind-daemon and the wbinfo-tool.
@@ -765,8 +765,7 @@ Branch:         %{BRANCH}
 Summary:        Samba3 password database library
 License:        GPL-3.0+
 Group:          System/Libraries
-Provides:       libpdb0
-Obsoletes:      libpdb0
+Obsoletes:      libpdb0 < %{version}
 
 %description -n libsamba-passdb0
 
@@ -1654,8 +1653,6 @@ fi
 %else
 %{_unitdir}/nmb.service
 %{_unitdir}/smb.service
-%dir %{_tmpfilesdir}
-%{_tmpfilesdir}/samba.conf
 %endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
 %attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/smbpasswd
@@ -1858,6 +1855,8 @@ fi
 %attr(0750,root,root) %dir %{LOGDIR}
 %ghost %dir %{PIDDIR}
 %if 0%{?suse_version} > 1220
+%dir %{_tmpfilesdir}
+%{_tmpfilesdir}/samba.conf
 %{_var}/adm/fillup-templates/sysconfig.samba-client
 %endif
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index dc79b66..5402ae2 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a80b6dfa1b959e07fabaf9cbe58450211ebed1bca0f181b05d5ad4ecaabbeb25
-size 52898
+oid sha256:bd3ffa44c58b0365d5be277d10165fe28bb68a9ff27235bdf6a7e5390e2126c5
+size 52888