diff --git a/templates/conf.d/geo.erb b/templates/conf.d/geo.erb
index 677d28c..0efc3ba 100644
--- a/templates/conf.d/geo.erb
+++ b/templates/conf.d/geo.erb
@@ -1,3 +1,4 @@
+# MANAGED BY PUPPET
 <%
   # sorting ip addresses in ascending order is more efficient for nginx - so we need
   # to convert them to numbers first via IPAddr
diff --git a/templates/conf.d/map.erb b/templates/conf.d/map.erb
index b5d6b2e..aa72d50 100644
--- a/templates/conf.d/map.erb
+++ b/templates/conf.d/map.erb
@@ -1,3 +1,4 @@
+# MANAGED BY PUPPET
 map <%= @string %> $<%= @name %> {
 <% if @hostnames -%>
   hostnames;
diff --git a/templates/conf.d/nginx.conf.erb b/templates/conf.d/nginx.conf.erb
index d0e4bbc..ccf8fc1 100644
--- a/templates/conf.d/nginx.conf.erb
+++ b/templates/conf.d/nginx.conf.erb
@@ -1,3 +1,4 @@
+# MANAGED BY PUPPET
 <% if @super_user -%>
 user <%= @daemon_user %>;
 <% end -%>
diff --git a/templates/conf.d/upstream_header.erb b/templates/conf.d/upstream_header.erb
index 6b7f448..4d94597 100644
--- a/templates/conf.d/upstream_header.erb
+++ b/templates/conf.d/upstream_header.erb
@@ -1,3 +1,4 @@
+# MANAGED BY PUPPET
 upstream <%= @name %> {
 <% if @upstream_cfg_prepend -%><% @upstream_cfg_prepend.sort_by{|k,v| k}.each do |key,value| %>
 <% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
diff --git a/templates/mailhost/mailhost.erb b/templates/mailhost/mailhost.erb
index ab8d03c..144703d 100644
--- a/templates/mailhost/mailhost.erb
+++ b/templates/mailhost/mailhost.erb
@@ -1,4 +1,4 @@
-
+# MANAGED BY PUPPET
 server {
 <%- if @listen_ip.is_a?(Array) then -%>
   <%- @listen_ip.each do |ip| -%>
diff --git a/templates/mailhost/mailhost_ssl.erb b/templates/mailhost/mailhost_ssl.erb
index cc4e620..aaea74c 100644
--- a/templates/mailhost/mailhost_ssl.erb
+++ b/templates/mailhost/mailhost_ssl.erb
@@ -1,4 +1,4 @@
-
+# MANAGED BY PUPPET
 server {
 <%- if @listen_ip.is_a?(Array) then -%>
   <%- @listen_ip.each do |ip| -%>
diff --git a/templates/streamhost/streamhost.erb b/templates/streamhost/streamhost.erb
index 0e3d948..260648a 100644
--- a/templates/streamhost/streamhost.erb
+++ b/templates/streamhost/streamhost.erb
@@ -1,3 +1,4 @@
+# MANAGED BY PUPPET
 server {
 <%- if @listen_ip.is_a?(Array) then -%>
   <%- @listen_ip.each do |ip| -%>
diff --git a/templates/vhost/vhost_header.erb b/templates/vhost/vhost_header.erb
index 2b6e410..cf26c3f 100644
--- a/templates/vhost/vhost_header.erb
+++ b/templates/vhost/vhost_header.erb
@@ -1,3 +1,4 @@
+# MANAGED BY PUPPET
 <% if @rewrite_www_to_non_www -%>
 <%- @server_name.each do |s| -%>
 server {
diff --git a/templates/vhost/vhost_ssl_header.erb b/templates/vhost/vhost_ssl_header.erb
index 9a23e32..6e1367f 100644
--- a/templates/vhost/vhost_ssl_header.erb
+++ b/templates/vhost/vhost_ssl_header.erb
@@ -1,3 +1,4 @@
+# MANAGED BY PUPPET
 <% if @rewrite_www_to_non_www -%>
 <%- @server_name.each do |s| -%>
 server {