diff --git a/manifests/install.pp b/manifests/install.pp
index c291606..b0674e3 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -10,5 +10,14 @@ class rsnapshot::install {
     ensure => $rsnapshot::package_ensure,
   }
 
+  # ensure run directory exists (systemd clears /var/run, so rsnapshot can't create PID files after reboot - issue#12)
+  $lockpath   = pick($rsnapshot::lockpath, $rsnapshot::params::config_lockpath, '/var/run/rsnapshot')
+  $tmpfiles_d = '/etc/tmpfiles.d'
+  
+  file { "${tmpfiles_d}/rsnapshot.conf":
+    ensure  => present,
+    content => "D ${lockpath} 0755 root root -",
+  }
+
 }
 
diff --git a/metadata.json b/metadata.json
index 17621ea..2e9104c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "loomsen-rsnapshot",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "author": "loomsen",
   "summary": "Configures rsnapshot.",
   "license": "Apache-2.0",
@@ -28,11 +28,11 @@
     },
     {
     "operatingsystem": "Ubuntu",
-    "operatingsystemrelease": [ "12.04", "10.04", "14.04" ]
+    "operatingsystemrelease": [ "12.04", "12.10", "13.04", "13.10", "14.04", "14.10", "15.04", "15.10", "16.04", "16.10", "17.04" ]
     },
     {
     "operatingsystem": "Fedora",
-    "operatingsystemrelease": [ "17", "18", "19", "20", "21", "22", "23", "24" ]
+    "operatingsystemrelease": [ "17", "18", "19", "20", "21", "22", "23", "24", "25" ]
     }
   ]
 }
diff --git a/spec/acceptance/default_spec.rb b/spec/acceptance/default_spec.rb
index ecd4754..304c81a 100644
--- a/spec/acceptance/default_spec.rb
+++ b/spec/acceptance/default_spec.rb
@@ -28,13 +28,20 @@ describe 'rsnapshot' do
     end
   end
   context 'files provisioned' do
+    describe file('/etc/tmpfiles.d/rsnapshot.conf') do
+      it { is_expected.to exist }
+      its(:content) { is_expected.to match 'D /var/run/rsnapshot 0755 root root -' }
+    end
+    describe file('/var/run/rsnapshot') do
+      it { should be_directory }
+    end
     describe file('/etc/rsnapshot/localhost.rsnapshot.conf') do
       it { is_expected.to exist }
       its(:content) { is_expected.to match 'backup' }
     end
     describe file('/etc/rsnapshot/example.com.rsnapshot.conf') do
       it { is_expected.to exist }
-      its(:content) { is_expected.to match 'backup' }
+      its(:content) { is_expected.to match 'backup\troot@example.com:/var/\t./' }
     end
     describe file('/etc/rsnapshot.conf') do
       it { is_expected.to exist }