diff --git a/VERSION b/VERSION
index de22f44d..72ca5f74 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.08.27.17.17.06
+Version 2.6.0-development+timestamp.2013.08.27.18.01.56
diff --git a/gluon/contenttype.py b/gluon/contenttype.py
index 4c80480b..cebca568 100644
--- a/gluon/contenttype.py
+++ b/gluon/contenttype.py
@@ -822,6 +822,7 @@ CONTENT_TYPE = {
     '.xsd': 'application/xml',
     '.xsl': 'application/xslt+xml',
     '.xslfo': 'text/x-xslfo',
+    '.xslm' : 'application/vnd.ms-excel.sheet.macroEnabled.12',
     '.xslt': 'application/xslt+xml',
     '.xspf': 'application/xspf+xml',
     '.xul': 'application/vnd.mozilla.xul+xml',