diff --git a/patches.tar.bz2 b/patches.tar.bz2
index aa511e9..8cfb3a2 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26fc924ec98d2f666472c5153ed745babbeb11f22f3d3bec8637e1441f6ff070
-size 278887
+oid sha256:7c3f53edc7d60ca911450022a27811290302b4584258523ea6234eebf3b2f7c5
+size 279174
diff --git a/samba.changes b/samba.changes
index 6b49743..072ab54 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May  2 15:37:33 UTC 2014 - ddiss@suse.com
+
+- Pass through vfs_btrfs snapshot manipulation requests when
+  "btrfs: manipulate snapshots = no" is configured; (bnc#874180).
+
 -------------------------------------------------------------------
 Fri Apr 25 08:47:57 UTC 2014 - ddiss@suse.com
 
diff --git a/samba.spec b/samba.spec
index c447a7a..ee8907b 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 3233
+%define SOURCE_TIMESTAMP 3235
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 17aabd0..0ee8871 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:a2a278edc3edd59138c816810b2c76c98fe4580914c5743ed92564c82a81b7aa
-size 54514
+oid sha256:24a494bef4004cba3d09ca3e02ae39add6ed69117431041984b31690325a5513
+size 54521