diff --git a/patches.tar.bz2 b/patches.tar.bz2
index a431ccc..0ff814c 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1d7aef655bfcf783d078f8dc200c676a435dc91f54b96f519cd61745d141908
-size 280856
+oid sha256:2a81bc72744e0af9c8a1331664eb1b57f26a8789119ab40bd1d185608f965bdd
+size 291711
diff --git a/samba.changes b/samba.changes
index 83c30ee..db963eb 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Aug 19 14:07:53 UTC 2014 - lmuelle@suse.com
+
+- Remove pre-11.2 patch which by default uses the smbpasswd passdb backend.
+
+-------------------------------------------------------------------
+Wed Aug 13 11:44:31 UTC 2014 - lmuelle@suse.com
+
+- build: disable mmap on s390 systems; (bso#10765); (bnc#886193).
+
+-------------------------------------------------------------------
+Mon Aug 11 11:55:35 UTC 2014 - lmuelle@suse.com
+
+- Create the cups smb backend as sym link pointing to smbspool; (bnc#891220).
+
 -------------------------------------------------------------------
 Fri Aug  1 16:34:44 UTC 2014 - ddiss@suse.com
 
@@ -87,6 +102,13 @@ Mon Jul 28 10:12:04 UTC 2014 - lmuelle@suse.com
     (bso#10706).
   + s3: Fix missing braces in nfs4_acls.c.
 
+-------------------------------------------------------------------
+Wed Jul  9 22:59:09 UTC 2014 - ddiss@suse.com
+
+- Reduce printer_list.tdb lock contention during printcap update;
+  (bso#10652); (bnc#883870).
+  + Only update the printer share inventory when needed.
+
 -------------------------------------------------------------------
 Tue Jul  8 12:35:25 UTC 2014 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index c6a50b8..6a7bf74 100644
--- a/samba.spec
+++ b/samba.spec
@@ -131,9 +131,6 @@ BuildRequires:  systemd-devel
 %define samba_source_signature_location http://ftp.samba.org/pub/samba/rc/samba-%{version}%{samba_ver_suffix}.tar.asc
 %endif
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
-%if 0%{?suse_version} && 0%{?suse_version} < 1111
-%define	guards_symbols default_passdb_backend
-%endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 %define libsmbclient_name libsmbclient
 %define libsmbsharemodes_name libsmbsharemodes
@@ -148,7 +145,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3274
+%define SOURCE_TIMESTAMP 3280
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1423,7 +1420,7 @@ for file in winbindd.h winbindd_proto.h; do
 done
 # cups SMB support
 mkdir	-p %{buildroot}/%{cups_lib_dir}/backend/
-touch %{buildroot}/%{cups_lib_dir}/backend/smb
+ln -s %{_bindir}/smbspool %{buildroot}/%{cups_lib_dir}/backend/smb
 # pam_smbpass is missing
 cp -a source3/pam_smbpass/samples examples/pam_smbpass
 install -m 0644 source3/pam_smbpass/CHANGELOG examples/pam_smbpass/CHANGELOG
@@ -1853,7 +1850,7 @@ fi
 %{_bindir}/testparm
 %dir %{cups_lib_dir}
 %dir %{cups_lib_dir}/backend
-%ghost %{cups_lib_dir}/backend/smb
+%{cups_lib_dir}/backend/smb
 %{_libdir}/libnss_wins.so.*
 %dir %{_libdir}/samba
 %{_libdir}/samba/charset
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index b83577b..d30f622 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:07e26efe1f46b9dd9cd561516465f7b79f85f07589d709f647c740cd58dfd0a1
-size 54734
+oid sha256:155bd6de1016ca8dd384bf800c9bd8394ac40ac508773aff353437fb4075d5f4
+size 54886