2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index bdf722be5..94d4aee70 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
 0.24.?
+    Fixed 1240 - puppet will function more like puppetd if graphing
+    or reporting are enabled.
+
     Fixed #1006 - puppetrun --class works again.  I added the class
     membership testing to the Ldap node terminus, and added tests,
     so it shouldn't break again.
diff --git a/bin/puppet b/bin/puppet
index 5e10ad460..530766800 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -212,6 +212,8 @@ begin
     # Translate it to a RAL catalog
     catalog = catalog.to_ral
 
+    catalog.host_config = true if Puppet[:graph] or Puppet[:report]
+
     catalog.finalize
 
     # And apply it