diff --git a/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java b/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java
index 278d2cd3b5..743ebd3557 100644
--- a/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java
@@ -238,6 +238,15 @@ public class TemplateServlet extends HttpServlet
     {
       path = path.concat("index.mustache");
     }
+    else
+    {
+      int index = path.lastIndexOf('.');
+
+      if (index > 0)
+      {
+        path = path.substring(0, index).concat(".mustache");
+      }
+    }
 
     return path;
   }