diff --git a/sources_non_forked/vim-bundle-mako/README.md b/sources_non_forked/vim-bundle-mako/README.md
index 037e44e4..1867831c 100644
--- a/sources_non_forked/vim-bundle-mako/README.md
+++ b/sources_non_forked/vim-bundle-mako/README.md
@@ -12,6 +12,7 @@ Useful configuration variables:
   detection.
 * `g:mako_default_outer_lang`: if ftdetect cannot detect the "outer" filetype of
   the file, this sets the default filetype used. If not set, defaults to "html".
+* `g:mako_extension`: set to the default string (with leading dot).  Default is ".mako"
 
 About mako: http://www.makotemplates.org/
 
diff --git a/sources_non_forked/vim-bundle-mako/ftdetect/mako.vim b/sources_non_forked/vim-bundle-mako/ftdetect/mako.vim
index 3051a431..49b7be04 100644
--- a/sources_non_forked/vim-bundle-mako/ftdetect/mako.vim
+++ b/sources_non_forked/vim-bundle-mako/ftdetect/mako.vim
@@ -1,11 +1,14 @@
 if !exists("g:mako_detect_lang_from_ext")
   let g:mako_detect_lang_from_ext = 1
 endif
+if !exists("g:mako_extension")
+  let g:mako_extension = ".mako"
+endif
 if g:mako_detect_lang_from_ext
-  au BufNewFile *.*.mako   execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  exe 'au BufNewFile *.*' . g:mako_extension . ' execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype'
   " it's important to get this before any of the normal BufRead autocmds execute
   " for this file, otherwise a mako tag at the start of the file can cause the
   " filetype to be set to mason
-  au BufReadPre *.*.mako   execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  exe 'au BufReadPre *.*' . g:mako_extension . ' execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype'
 endif
-au BufRead,BufNewFile *.mako     set filetype=mako
+exe 'au BufRead,BufNewFile *' . g:mako_extension . ' set filetype=mako'