diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 22d2657..57ff02e 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -63,6 +63,20 @@ class puppet::client {
 }
 
 
+# Install and configure Puppet client but disable service.
+#
+class puppet::manual inherits puppet::client {
+
+    Service["puppet"] {
+        ensure     => undef,
+        hasrestart => undef,
+        restart    => "/bin/echo 'Puppet restart requested, re-run puppet manually.' ; /bin/false",
+        enable     => false,
+    }
+
+}
+
+
 # Install and configure Puppet server
 #
 # === Global variables