diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..c501887f30868c6e21105790ef55d5bd5ccbd316
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+This is the MIT license: http://www.opensource.org/licenses/mit-license.php
+
+Copyright (c) 2006 Michael Bayer and contributors. Mako is a trademark of Michael
+Bayer.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/examples/bench/basic.py b/examples/bench/basic.py
index 40726929de775da9c4690b99aafa84106277538f..79f21b34ba44ef82e13eda18a7c86c3583d9b16c 100644
--- a/examples/bench/basic.py
+++ b/examples/bench/basic.py
@@ -1,3 +1,33 @@
+# basic.py - basic benchmarks adapted from Genshi
+# Copyright (C) 2006 Edgewall Software
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in
+#     the documentation and/or other materials provided with the
+#     distribution.
+#  3. The name of the author may not be used to endorse or promote
+#     products derived from this software without specific prior
+#     written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 from cgi import escape
 import os
 from StringIO import StringIO
diff --git a/lib/mako/__init__.py b/lib/mako/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2864e59191e1e15521f62ffab9ad732b72782238 100644
--- a/lib/mako/__init__.py
+++ b/lib/mako/__init__.py
@@ -0,0 +1,6 @@
+# __init__.py
+# Copyright (C) 2006 Michael Bayer mike_mp@zzzcomputing.com
+#
+# This module is part of Mako and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
+
diff --git a/lib/mako/ast.py b/lib/mako/ast.py
index 8c531407a96546bf18a31674a9b693a17f2b49d8..1542f8de5c58dc1d152711d618de2234102fcc6c 100644
--- a/lib/mako/ast.py
+++ b/lib/mako/ast.py
@@ -1,3 +1,9 @@
+# ast.py
+# Copyright (C) 2006 Michael Bayer mike_mp@zzzcomputing.com
+#
+# This module is part of Mako and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
+
 """utilities for analyzing expressions and blocks of Python code, as well as generating Python from AST nodes"""
 
 from compiler import ast, parse, visitor
diff --git a/lib/mako/codegen.py b/lib/mako/codegen.py
index 900a0e5620adc8b462040f8e1dc831179b209f7f..56b0048834de5c5f396e9c100e3efcc77b144128 100644
--- a/lib/mako/codegen.py
+++ b/lib/mako/codegen.py
@@ -1,3 +1,9 @@
+# codegen.py
+# Copyright (C) 2006 Michael Bayer mike_mp@zzzcomputing.com
+#
+# This module is part of Mako and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
+
 """provides the Compiler object for generating module source code."""
 
 import time
diff --git a/lib/mako/exceptions.py b/lib/mako/exceptions.py
index eea5003d91af662fead453735a4da3fb59c01163..a2bc255c117d69151e424ba6851550417ce17e4b 100644
--- a/lib/mako/exceptions.py
+++ b/lib/mako/exceptions.py
@@ -1,3 +1,9 @@
+# exceptions.py
+# Copyright (C) 2006 Michael Bayer mike_mp@zzzcomputing.com
+#
+# This module is part of Mako and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
+
 """exception classes"""
 
 class MakoException(Exception):
diff --git a/lib/mako/lexer.py b/lib/mako/lexer.py
index 2cae84705902d514752858ba430c13c2fc3c9d3c..225261cb9d8734f69b71052e5f9a239344b68ec3 100644
--- a/lib/mako/lexer.py
+++ b/lib/mako/lexer.py
@@ -1,3 +1,9 @@
+# lexer.py
+# Copyright (C) 2006 Michael Bayer mike_mp@zzzcomputing.com
+#
+# This module is part of Mako and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
+
 """provides the Lexer class for parsing template strings into parse trees."""
 
 import re
diff --git a/lib/mako/parsetree.py b/lib/mako/parsetree.py
index 9c42625de5a786731adf5f445d367cf72dca2e05..5f49ae768839aa41d3b4c39d2fe688290adac404 100644
--- a/lib/mako/parsetree.py
+++ b/lib/mako/parsetree.py
@@ -1,3 +1,9 @@
+# parsetree.py
+# Copyright (C) 2006 Michael Bayer mike_mp@zzzcomputing.com
+#
+# This module is part of Mako and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
+
 """defines the parse tree components for Mako templates."""
 
 from mako import exceptions, ast, util
diff --git a/lib/mako/pygen.py b/lib/mako/pygen.py
index 825439601f43b26508c0555af77c6b5d908a4de5..fc7ba3b4a45585926f426f38d2dfbefae1d20bda 100644
--- a/lib/mako/pygen.py
+++ b/lib/mako/pygen.py
@@ -1,3 +1,9 @@
+# pygen.py
+# Copyright (C) 2006 Michael Bayer mike_mp@zzzcomputing.com
+#
+# This module is part of Mako and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
+
 """utilities for generating and formatting literal Python code."""
 
 import re, string
diff --git a/lib/mako/runtime.py b/lib/mako/runtime.py
index 6c573f6f3f66a49c8c82f9596be2666972cd4309..d0518615bc97f007f24d8bc35659060602d21d61 100644
--- a/lib/mako/runtime.py
+++ b/lib/mako/runtime.py
@@ -1,3 +1,9 @@
+# runtime.py
+# Copyright (C) 2006 Michael Bayer mike_mp@zzzcomputing.com
+#
+# This module is part of Mako and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
+
 """provides the Context class, the runtime namespace for templates."""
 from mako import exceptions
 
diff --git a/lib/mako/template.py b/lib/mako/template.py
index 46f24cdc4158e419055c3da71f0ebb29e610badf..562495d40099026d68f5bf33042699d68e6304f9 100644
--- a/lib/mako/template.py
+++ b/lib/mako/template.py
@@ -1,3 +1,9 @@
+# template.py
+# Copyright (C) 2006 Michael Bayer mike_mp@zzzcomputing.com
+#
+# This module is part of Mako and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
+
 """provides the Template class, a facade for parsing, generating and executing template strings,
 as well as template runtime operations."""
 
diff --git a/lib/mako/util.py b/lib/mako/util.py
index 9f638257e8cd50707c0bdbab4262e395d2f76628..1d665fd93e24a1698024e8def14136f6c6147a34 100644
--- a/lib/mako/util.py
+++ b/lib/mako/util.py
@@ -1,3 +1,8 @@
+# util.py
+# Copyright (C) 2006 Michael Bayer mike_mp@zzzcomputing.com
+#
+# This module is part of Mako and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 try:
     Set = set