diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 426d6b7..a3ec78a 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebd63d3e39f8d47ec9924b51b6a37de6d7b76f155969ea7ef497a5351a3ae6ac
-size 190179
+oid sha256:f5e1c5b94dd6f996e26882689367702747bf99e624eaa624bc0832d207f3f0d9
+size 192013
diff --git a/samba.changes b/samba.changes
index 901b4fd..23a1b06 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr  1 15:20:21 UTC 2014 - lmuelle@suse.com
+
+- Add krb5rcache directory to the winbind package; (bnc#870607).
+- Cleanup and consolidate the sysconfig and systemd service files.
+
 -------------------------------------------------------------------
 Fri Mar 28 11:45:03 UTC 2014 - ddiss@suse.com
 
diff --git a/samba.spec b/samba.spec
index 4c67082..e07f486 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 3213
+%define SOURCE_TIMESTAMP 3217
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1282,6 +1282,7 @@ install -d -m 0755 -p \
 	%{buildroot}/%{LOGDIR} \
 	%{buildroot}/%{PIDDIR} \
 	%{buildroot}/%{_var}/adm/fillup-templates \
+	%{buildroot}/%{_var}/cache/krb5rcache \
 	%{buildroot}/%{_var}/run \
 	%{buildroot}/%{DOCDIR} \
 	%{buildroot}/%{DOCBOOKDIR} \
@@ -1356,24 +1357,10 @@ startScripts="smb nmb winbind"
 %endif
 %if 0%{?suse_version} > 1220
 for srv_name in nmb smb winbind; do
-	sed -e "s@PIDFile=/run/${srv_name}d.pid@PIDFile=/run/samba/${srv_name}d.pid@g" \
-		-e 's@Type=forking@Type=forking\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' \
-		../packaging/systemd/${srv_name}.service \
-		>%{buildroot}/%{_unitdir}/${srv_name}.service
-	echo -en "## Type:           string
-## Default:        \"-D\"
-## ServiceRestart:·${srv_name}
-${srv_name^^}DOPTIONS=\"-D\"\n" >>SUSE.sysconfig.${srv_name}
+	install -m 0644 -p systemd/${srv_name}.service %{buildroot}/%{_unitdir}
 	ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name}
 done
-sed -i -e "s@EnvironmentFile=-/etc/sysconfig/samba@EnvironmentFile=-/etc/sysconfig/samba\nExecStartPre=/usr/share/samba/update-apparmor-samba-profile@g" \
-	%{buildroot}/%{_unitdir}/smb.service
-head -n 2 ../packaging/systemd/samba.sysconfig > \
-	%{buildroot}%_var/adm/fillup-templates/sysconfig.samba
-cat SUSE.sysconfig.{nmb,smb} >>\
-	%{buildroot}%_var/adm/fillup-templates/sysconfig.samba
-cp -a SUSE.sysconfig.winbind \
-	%{buildroot}%_var/adm/fillup-templates/sysconfig.samba-winbind
+install -m 0644 systemd/sysconfig.* %{buildroot}%_var/adm/fillup-templates
 install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d
 install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}%{_prefix}/lib/tmpfiles.d/samba.conf
 %else
@@ -1595,6 +1582,9 @@ if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
 	fi
 fi
 %endif
+%if 0%{?suse_version} > 1220
+%{fillup_only -ans samba client}
+%endif
 if ! test -e %{_bindir}/get_printing_ticket; then
 	ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
 fi
@@ -1971,6 +1961,9 @@ fi
 %dir %{LOCKDIR}
 %attr(0750,root,root) %dir %{LOGDIR}
 %ghost %dir %{PIDDIR}
+%if 0%{?suse_version} > 1220
+%{_var}/adm/fillup-templates/sysconfig.samba-client
+%endif
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
 
 %files core-devel
@@ -2199,6 +2192,7 @@ fi
 %if 0%{?suse_version} > 1220
 %{_var}/adm/fillup-templates/sysconfig.samba-winbind
 %endif
+%attr(0770,root,root) %{_var}/cache/krb5rcache
 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
 
 %files doc -f filelist-samba-doc
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index ad46d6b..713b4d6 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:2335b2c8d99e62bc5c42684d5e233802ca77d48d0cc468cb10bc0a20fec0412c
-size 53913
+oid sha256:2099e649123423950387df410b3a1ea818ddb2c7e7e553e8bd2764a26bfcd0e3
+size 54809