diff --git a/manifests/agent.pp b/manifests/agent.pp
index be21825..fc2d000 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -8,7 +8,8 @@ class puppet::agent (
   $run_if_ipmatch  = undef,
   $maxsleep        = '3200',
   $puppet_master   = undef,
-  $environment = gsub($::domain,'.lan', '')) {
+  $cron            = true,
+  $environment     = gsub($::domain, '.lan', '')) {
   case $::kernel {
     'Linux' : {
       $puppetpkgs = ['puppet', 'puppet-common']
@@ -44,11 +45,14 @@ class puppet::agent (
     ensure    => $daemonize,
   }
   $cron_real = $daemonize ? {
-    false   => 'present',
+    false   => $cron ? {
+      true => 'present',
+      default => 'absent',
+    },
     true    => 'absent',
     default => $ensure,
   }
-
+  
   cron { 'puppetrun':
     command => '/usr/local/sbin/puppetd_run.sh',
     user    => 'root',
@@ -81,6 +85,7 @@ class puppet::agent (
       setting => 'splay',
       value   => $maxsleep;
     }
+
     ini_setting { 'puppet-agent-env':
       setting => 'environment',
       value   => $environment;
diff --git a/manifests/init.pp b/manifests/init.pp
index ff927fa..9e1f2a5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,9 +1,10 @@
 class puppet (
-  $ensure  = 'present',
-  $version = undef,
-  $agent   = true,
-  $server  = false,
+  $ensure     = 'present',
+  $version    = undef,
+  $agent      = true,
+  $server     = false,
   $facter_version              = $ensure,
+  $agent_cron = true,
   $puppetlabs_apt              = true,
   $agent_norunifloggedin       = false,
   $agent_daemonize             = true,
@@ -49,7 +50,8 @@ class puppet (
       daemonize       => $agent_daemonize,
       run_hour        => $agent_run_hour,
       run_if_ipmatch  => $agent_run_if_ipmatch,
-      maxsleep        => $agent_max_sleep
+      maxsleep        => $agent_max_sleep,
+      cron            => $agent_cron,
     }
   }