diff --git a/CHANGES b/CHANGES
index 557b9efb29060967ee6d1db5ff5b93ec17ab8267..ab3eeef3f328b1f5317b53a22564e6100ab7a240 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+0.2.5
+- Added last_modified accessor to Template,
+  returns the time.time() when the module
+  was created. [ticket:97]
+  
 0.2.4
 - Fixed compatibility with Jython 2.5b1.
 
diff --git a/lib/mako/template.py b/lib/mako/template.py
index 13823ea438b7b7f92887f212dbddb8c92fe74340..03194a3845232496b751acf48a29155b7ccd0c35 100644
--- a/lib/mako/template.py
+++ b/lib/mako/template.py
@@ -152,7 +152,10 @@ class Template(object):
         """return a def of this template as an individual Template of its own."""
         return DefTemplate(self, getattr(self.module, "render_%s" % name))
     
-
+    def last_modified(self): 
+        return self.module._modified_time    
+    last_modified = property(last_modified)
+    
 class ModuleTemplate(Template):
     """A Template which is constructed given an existing Python module.
     
@@ -202,6 +205,7 @@ class DefTemplate(Template):
         self.parent = parent
         self.callable_ = callable_
         self.output_encoding = parent.output_encoding
+        self.module = parent.module
         self.encoding_errors = parent.encoding_errors
         self.format_exceptions = parent.format_exceptions
         self.error_handler = parent.error_handler
diff --git a/setup.py b/setup.py
index 629760a3dab5335c86029a884f19b7b8a08205b0..a3f125af6d30a88c4d7a1983b3fc45f20a984551 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.2.4'
+version = '0.2.5'
 
 setup(name='Mako',
       version=version,