diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js
index fe58d8896..93867b49c 100644
--- a/generate/scripts/generateNativeCode.js
+++ b/generate/scripts/generateNativeCode.js
@@ -107,22 +107,26 @@ module.exports = function generateNativeCode() {
     return fse.copy(path.resolve(__dirname, "../templates/manual/src"), path.resolve(__dirname, "../../src"));
   }).then(function() {
     // Write out single purpose templates.
-    utils.writeFile("../binding.gyp", beautify(templates.binding.render(enabled)));
-    utils.writeFile("../src/nodegit.cc", templates.nodegitCC.render(enabled));
-    utils.writeFile("../lib/nodegit.js", beautify(templates.nodegitJS.render(enabled)));
+    utils.writeFile("../binding.gyp", beautify(templates.binding.render(enabled)), "binding.gyp");
+    utils.writeFile("../src/nodegit.cc", templates.nodegitCC.render(enabled), "nodegit.cc");
+    utils.writeFile("../lib/nodegit.js", beautify(templates.nodegitJS.render(enabled)), "nodegit.js");
     // Write out all the classes.
     enabled.forEach(function(idef) {
       if (idef.type && idef.type != "enum") {
         utils.writeFile(
-          "../src/" + idef.filename + ".cc", templates[idef.type + "_content"].render(idef)
+          "../src/" + idef.filename + ".cc",
+          templates[idef.type + "_content"].render(idef),
+          idef.type + "_content.cc"
         );
         utils.writeFile(
-          "../include/" + idef.filename + ".h", templates[idef.type + "_header"].render(idef)
+          "../include/" + idef.filename + ".h",
+          templates[idef.type + "_header"].render(idef),
+          idef.type + "_header.h"
         );
       }
     });
 
-    utils.writeFile("../lib/enums.js", beautify(templates.enums.render(enabled)));
+    utils.writeFile("../lib/enums.js", beautify(templates.enums.render(enabled)), "enums.js");
   }).then(function() {
     return exec("command -v astyle").then(function(astyle) {
       if (astyle) {
diff --git a/generate/scripts/utils.js b/generate/scripts/utils.js
index 3395fe272..b09d9a15f 100644
--- a/generate/scripts/utils.js
+++ b/generate/scripts/utils.js
@@ -20,13 +20,22 @@ var util = {
     }
   },
 
-  writeFile: function(file, content) {
+  writeFile: function(file, content, header) {
     try {
       var file = local(file);
       if (typeof content == "object") {
         content = JSON.stringify(content, null, 2)
       }
 
+      if (header) {
+        var commentPrefix = ~header.indexOf('.gyp') ? '#' : '//'
+        content = commentPrefix +
+          " This is a generated file, modify: generate/templates/" +
+          header +
+          "\n\n" +
+          content;
+      }
+
       fse.ensureFileSync(file);
       fse.writeFileSync(file, content);
       return true;
diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
index 9c5649abb..9a2813579 100644
--- a/generate/templates/templates/binding.gyp
+++ b/generate/templates/templates/binding.gyp
@@ -1,5 +1,3 @@
-# // This is a generated file, modify: generate/templates/binding.gyp.
-
 {
   "targets": [
     {
diff --git a/generate/templates/templates/class_content.cc b/generate/templates/templates/class_content.cc
index bda244812..c172e1fa5 100644
--- a/generate/templates/templates/class_content.cc
+++ b/generate/templates/templates/class_content.cc
@@ -1,4 +1,3 @@
-// This is a generated file, modify: generate/templates/class_content.cc.
 #include <nan.h>
 #include <string.h>
 
diff --git a/generate/templates/templates/class_header.h b/generate/templates/templates/class_header.h
index 11316c51f..84c9b5c4f 100644
--- a/generate/templates/templates/class_header.h
+++ b/generate/templates/templates/class_header.h
@@ -1,6 +1,5 @@
 #ifndef {{ cppClassName|upper }}_H
 #define {{ cppClassName|upper }}_H
-// generated from class_header.h
 #include <nan.h>
 #include <string>
 #include <queue>
diff --git a/generate/templates/templates/nodegit.cc b/generate/templates/templates/nodegit.cc
index a1bf7bf30..f165307b3 100644
--- a/generate/templates/templates/nodegit.cc
+++ b/generate/templates/templates/nodegit.cc
@@ -1,4 +1,3 @@
-// This is a generated file, modify: generate/templates/nodegit.cc.
 #include <node.h>
 #include <v8.h>
 
diff --git a/generate/templates/templates/struct_content.cc b/generate/templates/templates/struct_content.cc
index b6ab0f16b..cab524a80 100644
--- a/generate/templates/templates/struct_content.cc
+++ b/generate/templates/templates/struct_content.cc
@@ -1,4 +1,3 @@
-// This is a generated file, modify: generate/templates/struct_content.cc.
 #include <nan.h>
 #include <string.h>
 #ifdef WIN32
diff --git a/generate/templates/templates/struct_header.h b/generate/templates/templates/struct_header.h
index d15bf677c..0320fbbf6 100644
--- a/generate/templates/templates/struct_header.h
+++ b/generate/templates/templates/struct_header.h
@@ -1,6 +1,5 @@
 #ifndef {{ cppClassName|upper }}_H
 #define {{ cppClassName|upper }}_H
-// generated from struct_header.h
 #include <nan.h>
 #include <string>
 #include <queue>