diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 5394501..6d176a2 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93c6f796612ee2fd3b5b8b6163e91711496e2142edfa5e77d22cbc631d8e2303
-size 86482
+oid sha256:d61d42d59a8decd3086d15bd857877b55f7e79890496cd2de467bba8fcbd19a7
+size 93441
diff --git a/samba.changes b/samba.changes
index ec59e27..dfa5bb0 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Apr  9 12:02:25 UTC 2015 - noel.power@suse.com
+
+- Add sparse file support for samba; (fate#318424).
+
+-------------------------------------------------------------------
+Wed Apr  8 18:11:20 UTC 2015 - lmuelle@suse.com
+
+- Enable building of the get_printing_ticket binary (samba-krb-printing) with
+  waf; (bnc#921530).
+
 -------------------------------------------------------------------
 Fri Mar 20 13:21:43 UTC 2015 - ddiss@suse.com
 
@@ -431,11 +442,17 @@ Tue Sep 23 12:02:16 UTC 2014 - lmuelle@suse.com
     read; (bso#10794).
 
 -------------------------------------------------------------------
-Thu Sep 18 16:59:49 UDT 2014 - jmcdonough@suse.com
+Thu Sep 18 16:59:49 UTC 2014 - jmcdonough@suse.com
 
 - Wait for network-online.target to prevent caching of
   pre-network failures; (bnc#889175).
 
+-------------------------------------------------------------------
+Thu Sep 18 08:54:38 UTC 2014 - jmcdonough@suse.com
+
+- Use domain name if search by domain SID fails to send SIDHistory
+  lookups to correct idmap backend; (bnc#773464).
+
 -------------------------------------------------------------------
 Thu Sep 11 17:26:26 UTC 2014 - ddiss@suse.com
 
diff --git a/samba.spec b/samba.spec
index 6c1a840..0dbb776 100644
--- a/samba.spec
+++ b/samba.spec
@@ -143,7 +143,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3386
+%define SOURCE_TIMESTAMP 3391
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -329,6 +329,25 @@ Branch:         %{BRANCH}
 
 %endif
 
+%package krb-printing
+Summary:        Wrapper binary for kerberized printing
+License:        GPL-3.0+
+Group:          Productivity/Networking/Samba
+PreReq:         coreutils
+Provides:       samba-gplv3-krb-printing = %{version}
+Obsoletes:      samba-gplv3-krb-printing < %{version}
+%if 0%{?suse_version} > 1000
+PreReq:         permissions
+%endif
+Requires:       samba-client >= %{version}
+
+%description krb-printing
+A wrapper binary to run smbspool with the original calling UID.
+
+Source Timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
+
 %package libs
 Summary:        Samba libraries
 License:        GPL-3.0+
@@ -1085,6 +1104,7 @@ 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
+install -m 0644 vendor-files/tools/get_printing_ticket.c source3/client/get_printing_ticket.c
 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 && \
@@ -1384,7 +1404,7 @@ for file in winbindd.h winbindd_proto.h; do
 done
 # cups SMB support
 mkdir	-p %{buildroot}/%{cups_lib_dir}/backend/
-ln -s %{_bindir}/smbspool %{buildroot}/%{cups_lib_dir}/backend/smb
+touch %{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
@@ -1510,6 +1530,9 @@ if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
 	fi
 fi
 %endif
+if ! test -e %{_bindir}/get_printing_ticket; then
+	ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
+fi
 %if 0%{?suse_version} > 1220
 %{fillup_only -ans samba client}
 %endif
@@ -1519,6 +1542,16 @@ fi
 /sbin/ldconfig
 %{?insserv_cleanup:%{insserv_cleanup}}
 
+%post krb-printing
+if test ${1:-0} -eq 1 -a -d %{cups_lib_dir}/backend; then
+	ln -fs %{_bindir}/get_printing_ticket %{cups_lib_dir}/backend/smb
+fi
+
+%postun krb-printing
+if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{cups_lib_dir}/backend; then
+	ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
+fi
+
 %post   -n libdcerpc-atsvc0 -p /sbin/ldconfig
 %postun -n libdcerpc-atsvc0 -p /sbin/ldconfig
 %post   -n libdcerpc-binding0 -p /sbin/ldconfig
@@ -1797,7 +1830,7 @@ fi
 %{_bindir}/testparm
 %dir %{cups_lib_dir}
 %dir %{cups_lib_dir}/backend
-%{cups_lib_dir}/backend/smb
+%ghost %{cups_lib_dir}/backend/smb
 %{_libdir}/libnss_wins.so.*
 %dir %{_libdir}/samba
 %{_libdir}/samba/charset
@@ -2099,6 +2132,13 @@ fi
 %doc %{_datadir}/susehelp
 %endif
 
+%files krb-printing
+%defattr(-,root,root)
+%attr(0700,root,root) %{_bindir}/get_printing_ticket
+%dir %{cups_lib_dir}
+%dir %{cups_lib_dir}/backend
+%ghost %{cups_lib_dir}/backend/smb
+
 %files -n libdcerpc-atsvc0
 %defattr(-,root,root)
 %_libdir/libdcerpc-atsvc.so.0*
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 68daa3e..be1cec1 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:414d189b5f16218f53348bcf53df0faba665355ae7f1dde595176f3b6a840193
-size 53966
+oid sha256:d07624fd6c8d5c509da49c7a35963749c87507416acdd8667e510cf3be5bb351
+size 54414