diff --git a/lib/spack/spack/modules.py b/lib/spack/spack/modules.py
index 04f43b96050717b3f83a03390094a9786e17411c..0f921d7bf27270890f50fdfb3e3477325fea24af 100644
--- a/lib/spack/spack/modules.py
+++ b/lib/spack/spack/modules.py
@@ -45,6 +45,7 @@
 import os.path
 import re
 import textwrap
+import datetime
 
 import llnl.util.tty as tty
 import spack
@@ -401,7 +402,7 @@ class TclModule(EnvModule):
     autoload_format = ('if ![ is-loaded {module_file} ] {{\n'
                        '    puts stderr "Autoloading {module_file}"\n'
                        '    module load {module_file}\n'
-                       '}}\n')
+                       '}}\n\n')
 
     prerequisite_format = 'prereq {module_file}\n'
 
@@ -420,6 +421,12 @@ def use_name(self):
     def header(self):
         # TCL Modulefile header
         header = '#%Module1.0\n'
+        header += '## Module file created by spack (https://github.com/LLNL/spack)'
+        header += ' on %s\n' % datetime.datetime.now()
+        header += '##\n'
+        header += '## %s\n' % self.spec.short_spec
+        header += '##\n'
+
         # TODO : category ?
         # Short description
         if self.short_description: