diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 0716674..fd31bfa 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5f1c70e53f933f40d7de5e78231c3ca40cf7e5354b416340d02410c4502408e
-size 155870
+oid sha256:4fc8fdce86859fe3874c82f5a2b15533e816e6297a1bbe3461d31f97850ef850
+size 159039
diff --git a/samba.changes b/samba.changes
index 82672e5..ff70b51 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 28 15:16:30 UTC 2014 - ddiss@suse.com
+
+- Fix vfs_btrfs build on older platforms with duplicate WRITE_FLUSH
+  definitions; (bnc#860832).
+
 -------------------------------------------------------------------
 Tue Jan 28 14:34:57 UTC 2014 - ddiss@suse.com
 
diff --git a/samba.spec b/samba.spec
index adbd6e5..18e08b0 100644
--- a/samba.spec
+++ b/samba.spec
@@ -139,7 +139,7 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3160
+%define SOURCE_TIMESTAMP 3161
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 0126035..fc75b3c 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:7491d7871395869ef840ae65595bb39f00ac69d8c929f893be2fc965f0b745ba
-size 53739
+oid sha256:f3d4235fe6fd2963996cacbea4590c142cba0920d9a39c4d810a1ba298140ae8
+size 53716