diff --git a/patches.tar.bz2 b/patches.tar.bz2
index fd31bfa..d788d14 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fc8fdce86859fe3874c82f5a2b15533e816e6297a1bbe3461d31f97850ef850
-size 159039
+oid sha256:447f4b88477ebc5311e4fe54433e750d6bd70b29c4e5f266efda33fdcf0dd485
+size 159179
diff --git a/samba.changes b/samba.changes
index ff70b51..2a3b876 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Feb  4 17:22:52 UTC 2014 - lmuelle@suse.com
+
+- Set the PID directory to /run/samba on post-12.2 systems.
+
+-------------------------------------------------------------------
+Tue Feb  4 16:02:45 UTC 2014 - lmuelle@suse.com
+
+- Make use of the tmpfilesdir macro while calling systemd-tmpfiles.
+
+-------------------------------------------------------------------
+Tue Jan 28 20:05:30 CET 2014 - nopower@suse.de
+
+- Make winbindd print the interface version when it gets an INTERFACE_VERSION
+  request; (bnc#726937).
+
 -------------------------------------------------------------------
 Tue Jan 28 15:16:30 UTC 2014 - ddiss@suse.com
 
@@ -37,19 +53,6 @@ Fri Jan 24 14:30:45 UTC 2014 - lmuelle@suse.com
 - s3: winbindd: Move calling setup_domain_child() into add_trusted_domain();
   (bso#10358); (bnc#786677).
 
--------------------------------------------------------------------
-Wed Jan 22 17:32:54 CET 2014 - nopower@suse.de
-
-- Make winbindd print the interface version when it gets an INTERFACE_VERSION
-  request; (bnc#726937).
-
--------------------------------------------------------------------
-Tue Jan 21 20:22:12 CET 2014 - nopower@suse.de
-
-- Allow smbcacls to take a '--propagate-inheritance' flag to indicate that
-  the add, delete, modify and set operations now support automatic
-  propagation of inheritable ACE(s); (FATE#316474).
-
 -------------------------------------------------------------------
 Mon Jan 20 10:47:54 UTC 2014 - lmuelle@suse.com
 
@@ -218,6 +221,13 @@ Thu Nov 21 14:13:37 UTC 2013 - lmuelle@suse.com
 
 - Add systemd support for post-12.2 systems.
 
+-------------------------------------------------------------------
+Tue Nov 19 19:17:40 CET 2013 - nopower@suse.de
+
+- Allow smbcacls to take a '--propagate-inheritance' flag to indicate that
+  the add, delete, modify and set operations now support automatic
+  propagation of inheritable ACE(s); (FATE#316474).
+
 -------------------------------------------------------------------
 Fri Nov 15 18:04:50 UTC 2013 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 18e08b0..e07bd27 100644
--- a/samba.spec
+++ b/samba.spec
@@ -15,6 +15,8 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
+
 Name:           samba
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
 BuildRequires:  autoconf
@@ -139,7 +141,7 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3161
+%define SOURCE_TIMESTAMP 3177
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -198,7 +200,11 @@ PreReq:         %{fillup_prereq}
 %define	LOCKDIR %{_localstatedir}/lib/samba
 %define	CONFIGDIR %{_sysconfdir}/samba
 %define	INITDIR %{_sysconfdir}/init.d
+%if 0%{?suse_version} > 1220
+%define	PIDDIR /run/samba
+%else
 %define	PIDDIR %{_localstatedir}/run/samba
+%endif
 %if "%{_vendor}" == "suse"
 %define	NET_CFGDIR network
 %else
@@ -1531,7 +1537,7 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || :
 %post
 %if 0%{?suse_version} > 1220
 %service_add_post nmb.service smb.service
-%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf
+%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf
 %fillup_only
 %endif
 
@@ -1713,7 +1719,7 @@ else
 fi
 %if 0%{?suse_version} > 1220
 %service_add_post winbind.service
-%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf
+%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf
 %{fillup_only -ans samba winbind}
 %endif
 
@@ -1764,6 +1770,8 @@ fi
 %else
 %{_unitdir}/nmb.service
 %{_unitdir}/smb.service
+%dir %{_tmpfilesdir}
+%{_tmpfilesdir}/samba.conf
 %endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
 %attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/smbpasswd
@@ -1800,10 +1808,6 @@ fi
 %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smb.xml
 %dir %{_datadir}/samba
 %{_datadir}/samba/update-apparmor-samba-profile
-%if 0%{?suse_version} > 1222
-%dir %{_prefix}/lib/tmpfiles.d
-%{_prefix}/lib/tmpfiles.d/samba.conf
-%endif
 %doc %{_mandir}/man1/smbstatus.1.*
 %doc %{_mandir}/man5/smbpasswd.5.*
 %doc %{_mandir}/man8/nmbd.8.*
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index fc75b3c..c134fee 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:f3d4235fe6fd2963996cacbea4590c142cba0920d9a39c4d810a1ba298140ae8
-size 53716
+oid sha256:6a2851cf9bd81cce52815f70f686c87f05b946ff36938c5b2647b2fda27d71ce
+size 54144