diff --git a/manifests/agent/service.pp b/manifests/agent/service.pp
index 162e64c9..d2ac4df9 100644
--- a/manifests/agent/service.pp
+++ b/manifests/agent/service.pp
@@ -43,6 +43,13 @@
         }
       }
     }
+    'systemd.timer': {
+      $times = ip_to_cron($puppet::runinterval)
+      file { '/tmp/puppetcron.timer':
+        #file { '/etc/systemd/system/puppetcron.timer':
+        content => template('puppet/agent/systemd.puppetcron.timer.erb')
+      }
+    }
     'none': {
       service { 'puppet':
         ensure    => stopped,
diff --git a/templates/agent/systemd.puppetcron.timer.erb b/templates/agent/systemd.puppetcron.timer.erb
new file mode 100644
index 00000000..9ecf7034
--- /dev/null
+++ b/templates/agent/systemd.puppetcron.timer.erb
@@ -0,0 +1,10 @@
+[Unit]
+Description=Puppet Agent via systemd.timer
+
+[Timer]
+OnActiveSec=0m
+OnCalendar=<%= times[0] %>:<%= times[1] %>
+Persistent=true     
+ 
+[Install]
+WantedBy=timers.target