diff --git a/puppet/files/puppet.disabled.default b/puppet/files/puppet.disabled.default
new file mode 100644
index 0000000..d9f5fd4
--- /dev/null
+++ b/puppet/files/puppet.disabled.default
@@ -0,0 +1,7 @@
+# Defaults for puppet - sourced by /etc/init.d/puppet
+
+# Start puppet on boot?
+START=yes
+
+# Startup options
+DAEMON_OPTS=""
diff --git a/puppet/files/puppet.enabled.default b/puppet/files/puppet.enabled.default
new file mode 100644
index 0000000..d9f5fd4
--- /dev/null
+++ b/puppet/files/puppet.enabled.default
@@ -0,0 +1,7 @@
+# Defaults for puppet - sourced by /etc/init.d/puppet
+
+# Start puppet on boot?
+START=yes
+
+# Startup options
+DAEMON_OPTS=""
diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 3f02a2a..af3050f 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -64,9 +64,13 @@ class puppet::client {
                 restart   => "/usr/bin/pkill -HUP puppetd",
                 subscribe => File["/etc/puppet/puppet.conf"],
             }
-            augeas { "set-default-puppet":
-                context => "/files/etc/default/puppet",
-                changes => ["set START yes"],
+            file { "/etc/default/puppet":
+                ensure  => present,
+                source  => "puppet:///puppet/puppet.enabled.default",
+                mode    => 0644,
+                owner   => root,
+                group   => root,
+                notify  => Service["puppet"],
             }
         }
         default: {
@@ -106,8 +110,8 @@ class puppet::client {
 class puppet::manual inherits puppet::client {
 
     Service["puppet"] {
-        ensure     => undef,
-        enable     => false,
+        ensure => undef,
+        enable => false,
     }
 
     Cron["puppet-check"] {
@@ -116,8 +120,8 @@ class puppet::manual inherits puppet::client {
 
     case $operatingsystem {
         debian,ubuntu: {
-            Augeas["set-default-puppet"] {
-                changes => ["set START no"],
+            File["/etc/default/puppet"] {
+                source  => "puppet:///puppet/puppet.disabled.default",
             }
         }
     }