diff --git a/radicale-service-unit b/radicale-service-unit
index 3177cd6..9a753ba 100644
--- a/radicale-service-unit
+++ b/radicale-service-unit
@@ -10,7 +10,8 @@ User=radicale
 Group=radicale
 UMask=0027
 Type=forking
-ExecStart=/usr/bin/radicale --daemon
+PIDFile=/var/run/radicale/radicale.pid
+ExecStart=/usr/bin/radicale --daemon --pid=/var/run/radicale/radicale.pid
 PrivateTmp=true
 PrivateDevices=true
 
diff --git a/radicale-tmpfiles.conf b/radicale-tmpfiles.conf
new file mode 100644
index 0000000..c78389c
--- /dev/null
+++ b/radicale-tmpfiles.conf
@@ -0,0 +1 @@
+d /var/run/radicale   755 radicale radicale
diff --git a/radicale.spec b/radicale.spec
index a00c08a..442db04 100644
--- a/radicale.spec
+++ b/radicale.spec
@@ -1,6 +1,6 @@
 Name:             radicale
 Version:          0.8
-Release:          10%{?dist}
+Release:          11%{?dist}
 Summary:          A simple CalDAV (calendar) and CardDAV (contact) server
 Group:            Applications/Internet
 License:          GPLv3+
@@ -12,6 +12,7 @@ Source3:          %{name}-httpd
 Source4:          %{name}.te
 Source5:          %{name}.fc
 Source6:          %{name}.if
+Source7:          %{name}-tmpfiles.conf
 # config adjustments for systemwide installation
 Patch0:           %{name}-%{version}-systemwide.patch
 
@@ -109,6 +110,9 @@ mkdir -p  %{buildroot}%{_sharedstatedir}/%{name}/
 
 install -D -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
 install -D -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+install -D -p -m 644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+mkdir -p %{buildroot}%{_localstatedir}/run
+install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/
 
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
 touch %{buildroot}%{_localstatedir}/log/%{name}/%{name}.log
@@ -169,6 +173,8 @@ fi
 %{python_sitelib}/Radicale-*.egg-info
 %{_bindir}/%{name}
 %{_unitdir}/%{name}.service
+%{_tmpfilesdir}/%{name}.conf
+%dir %attr(755, %{name}, %{name}) %{_localstatedir}/run/%{name}
 %dir %attr(750, %{name}, %{name}) %{_localstatedir}/log/%{name}
 %ghost %attr(640, %{name}, %{name}) %{_localstatedir}/log/%{name}/%{name}.log
 %dir %attr(750, %{name}, %{name}) %{_sharedstatedir}/%{name}/
@@ -185,6 +191,9 @@ fi
 %{_datadir}/selinux/*/%{name}.pp
 
 %changelog
+* Mon Aug 04 2014 Juan Orti Alcaine <jorti@fedoraproject.org> - 0.8-11
+- Handle PID file.
+
 * Thu Jul 17 2014 Juan Orti Alcaine <jorti@fedoraproject.org> - 0.8-10
 - Add network-online.target dependency. Bug #1119818