diff --git a/puppet/bootstrap-server.sh b/puppet/bootstrap-server.sh
index 457877f..87b97bb 100755
--- a/puppet/bootstrap-server.sh
+++ b/puppet/bootstrap-server.sh
@@ -27,8 +27,11 @@ if [ $? -eq 0 ]; then
         echo "\$homename = '`hostname -f`'"
         echo "\$puppet_ssldir = '${ssldir}'"
         echo "include puppet::server::apache"
+        echo "include puppet::manual"
     ) | puppet --no-report
 else
-    echo "include puppet::server::apache" | \
-        puppet apply --no-report --manifest /dev/stdin /dev/null
+    (
+        echo "include puppet::server::apache"
+        echo "include puppet::manual"
+    ) | puppet apply --no-report --manifest /dev/stdin /dev/null
 fi
diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index de22122..85d6e6e 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -114,8 +114,9 @@ class puppet::client {
 class puppet::manual inherits puppet::client {
 
     Service["puppet"] {
-        ensure => undef,
-        enable => false,
+        ensure    => undef,
+        enable    => false,
+        subscribe => undef,
     }
 
     Cron["puppet-check"] {