diff --git a/patches.tar.bz2 b/patches.tar.bz2
index fe01792..5394501 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1798fcdd83014716090c2f82c7d700861f09de303b8a1e04b51a1e479bc890eb
-size 85973
+oid sha256:93c6f796612ee2fd3b5b8b6163e91711496e2142edfa5e77d22cbc631d8e2303
+size 86482
diff --git a/samba.changes b/samba.changes
index 7ede8fc..ec59e27 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Mar 20 13:21:43 UTC 2015 - ddiss@suse.com
+
+- Correctly retain errno from Btrfs snapshot ioctls; (bnc#923374).
+
+-------------------------------------------------------------------
+Wed Mar 18 17:57:50 UTC 2015 - lmuelle@suse.com
+
+- Simplify libxslt build requirement and README.SUSE install.
+- Remove no longer required cleanup steps while populating the build root.
+
+-------------------------------------------------------------------
+Tue Mar 17 15:21:58 UTC 2015 - ddiss@suse.com
+
+- Remove deprecated base_rid example from idmap_rid manpage; (bso#11169);
+  (bnc#913304).
+
 -------------------------------------------------------------------
 Thu Mar  5 10:35:21 UTC 2015 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 3a69035..6c1a840 100644
--- a/samba.spec
+++ b/samba.spec
@@ -110,12 +110,7 @@ BuildRequires:  libtevent-devel
 BuildRequires:  python-tevent
 # to generate the man pages
 BuildRequires:  docbook-xsl-stylesheets
-%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1141
 BuildRequires:  libxslt
-%endif
-%if 0%{?suse_version} > 1140 && 0%{?suse_version} < 1211
-BuildRequires:  libxslt1
-%endif
 %if 0%{?suse_version} > 1210
 BuildRequires:  dbus-1-devel
 BuildRequires:  libxslt-tools
@@ -148,7 +143,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3382
+%define SOURCE_TIMESTAMP 3386
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1090,10 +1085,6 @@ for patch in $( patches/tools/guards %{guards_symbols} <patches/series); do
 done
 # vendor-files (config, scripts, tools)
 %setup -T -D -a 1 -n samba-%{samba_ver_full} -q
-for file in docs/htmldocs/index.html vendor-files/docu/README.vendor; do
-	sed -e "s/VENDOR/%{VENDOR}/g" "${file}" >"${file}.new" && \
-		mv "${file}.new" "${file}"
-done
 install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/
 # Create and add vendor suffix
 test -f vendor-files/tools/package-data && \
@@ -1373,8 +1364,8 @@ for file in ${LOGROTATE_FILES}; do
 	touch "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file}"
 	echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file}
 done
-install -m 0644 docu/README.vendor %{buildroot}/%{DOCDIR}/README.%{VENDOR}
-# SuSEhelp files
+install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/
+# SUSEhelp files
 install -m 0644 docu/Samba.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop
 install -d -m 0755 -p ../docs/htmldocs
 install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html
@@ -1401,12 +1392,8 @@ install -m 0644 source3/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL
 install -m 0644 source3/pam_smbpass/README examples/pam_smbpass/README
 install -m 0644 source3/pam_smbpass/TODO examples/pam_smbpass/TODO
 mv COPYING README Roadmap WHATSNEW.txt %{buildroot}/%{DOCDIR}/
-# this is empty
-rm -rf docs/yodldocs
-rm -rf docs/manpages
 cp -a docs/* %{buildroot}/%{DOCDIR}
-rm -rf "%{buildroot}/%{DOCBOOKDIR}"
-rm -f examples/VFS/*~
+rmdir "%{buildroot}/%{DOCBOOKDIR}"
 cp -a examples/ %{buildroot}/%{DOCDIR}
 # finally build filelist-samba-doc
 for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index ec8a670..68daa3e 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:96ea3cf6b956264c5235e234e9ed0c2b3194c7b5fbf6f892a34889bf73ee2b3d
-size 54713
+oid sha256:414d189b5f16218f53348bcf53df0faba665355ae7f1dde595176f3b6a840193
+size 53966