diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 3cb764d..5360df1 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9133532eefe939f08556f7200db6260d148726b27c6c0cffe9827a8f5e5d714
-size 188023
+oid sha256:d051c5e2589f5a5d74dbd3a606e82d51916d5c0fb25442a3fcf4c0696e436fe9
+size 188134
diff --git a/samba.changes b/samba.changes
index b071f91..2f467c7 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 21 18:59:29 UTC 2014 - lmuelle@suse.com
+
+- Default with the cache and lock directory to the same path to have both
+  non-persistent and persistent data at one location; (bnc#846586).
+
 -------------------------------------------------------------------
 Wed Mar 12 13:57:29 UTC 2014 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index b71ea74..f23943f 100644
--- a/samba.spec
+++ b/samba.spec
@@ -144,7 +144,7 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3208
+%define SOURCE_TIMESTAMP 3211
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1210,6 +1210,7 @@ CONFIGURE_OPTIONS="\
 	--sysconfdir=%{CONFIGDIR} \
 	--with-configdir=%{CONFIGDIR} \
 	--libdir=%{_libdir} \
+	--with-cachedir=%{LOCKDIR} \
 	--with-lockdir=%{LOCKDIR} \
 	--with-logfilebase=%{LOGDIR} \
 	--mandir=%{_mandir} \
@@ -1277,7 +1278,6 @@ install -d -m 0755 -p \
 	%{buildroot}/%{_datadir}/omc/svcinfo.d \
 	%{buildroot}/%{_datadir}/samba/{LDAP,templates} \
 	%{buildroot}/%{_localstatedir}/adm \
-	%{buildroot}/%{_localstatedir}/cache/samba \
 	%{buildroot}/%{LOCKDIR}/{netlogon,drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},printing,profiles,winbindd_privileged} \
 	%{buildroot}/%{LOGDIR} \
 	%{buildroot}/%{PIDDIR} \
@@ -1968,7 +1968,6 @@ fi
 %doc %{DOCDIR}/README.%{VENDOR}
 %{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf
 %{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client
-%dir %{_localstatedir}/cache/samba
 %dir %{LOCKDIR}
 %attr(0750,root,root) %dir %{LOGDIR}
 %ghost %dir %{PIDDIR}
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 8259d3d..41e88db 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:b6f2ab5fbae5a9e84ddafac2bb8d1946f3657a3430b8eee17248bec98331e5b8
-size 53896
+oid sha256:f6e78fa95b2ffd9cb5ec1652b91b130dff35b12867021b257d5d5263c5842029
+size 53994