diff --git a/.gitignore b/.gitignore
index 187ad7c..347d136 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /criu-2.11.1.tar.bz2
 /criu-2.12.tar.bz2
 /criu-3.0.tar.bz2
+/criu-3.1.tar.bz2
diff --git a/criu-tmpfiles.conf b/criu-tmpfiles.conf
new file mode 100644
index 0000000..66cc5bf
--- /dev/null
+++ b/criu-tmpfiles.conf
@@ -0,0 +1 @@
+d /run/criu 0755 root root -
diff --git a/criu.spec b/criu.spec
index 397fb59..3e3ea95 100644
--- a/criu.spec
+++ b/criu.spec
@@ -1,5 +1,5 @@
 Name: criu
-Version: 3.0
+Version: 3.1
 Release: 1%{?dist}
 Provides: crtools = %{version}-%{release}
 Obsoletes: crtools <= 1.0-2
@@ -16,6 +16,8 @@ Source1: criu.8
 Source2: crit.1
 %endif
 
+Source3: criu-tmpfiles.conf
+
 BuildRequires: libnet-devel
 BuildRequires: protobuf-devel protobuf-c-devel python2-devel libnl3-devel libcap-devel
 BuildRequires: perl
@@ -72,7 +74,7 @@ their content in human-readable form.
 %build
 # %{?_smp_mflags} does not work
 # -fstack-protector breaks build
-CFLAGS+=`echo %{optflags} | sed -e 's,-fstack-protector\S*,,g'` make V=1 WERROR=0 PREFIX=%{_prefix}
+CFLAGS+=`echo %{optflags} | sed -e 's,-fstack-protector\S*,,g'` make V=1 WERROR=0 PREFIX=%{_prefix} RUNDIR=/run/criu
 %if 0%{?fedora}
 make docs V=1
 %endif
@@ -90,6 +92,10 @@ install -p -m 644  -D %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 install -p -m 644  -D %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/crit.1
 %endif
 
+mkdir -p %{buildroot}%{_tmpfilesdir}
+install -m 0644 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+install -d -m 0755 %{buildroot}/run/%{name}/
+
 %if 0%{?rhel}
 # remove devel package
 rm -rf $RPM_BUILD_ROOT%{_includedir}/criu
@@ -107,6 +113,8 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 %{_libdir}/*.so.*
 %{_libexecdir}/%{name}
 %endif
+%dir /run/%{name}
+%{_tmpfilesdir}/%{name}.conf
 %doc README.md COPYING
 
 %if 0%{?fedora}
@@ -126,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 
 
 %changelog
+* Mon May 22 2017 Adrian Reber <adrian@lisas.de> - 3.1-1
+- Update to 3.1
+
 * Tue Apr 25 2017 Adrian Reber <adrian@lisas.de> - 3.0-1
 - Update to 3.0
 
diff --git a/sources b/sources
index 58a7eff..ae920d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (criu-3.0.tar.bz2) = 79e36cc4b5602b3554cbf65bd26d0f9bbc2028c1a1e9e5af1d3aa991f4b2ba46a53db8763d93827d501f7ef6a76b0d90ce99d07e330f7d927298367ee22ac9b7
+SHA512 (criu-3.1.tar.bz2) = 6cf5353cb26c4b6869906cbfa36dfff794af46518bcc357f93f25bdeb3b544f30970002c73055acf42f31756ca40c1ca8f7770577a2d1da3d9732ee5c420b46f