diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SupportResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SupportResource.java
index b83615f415..9d5218d84b 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SupportResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SupportResource.java
@@ -46,7 +46,6 @@ import sonia.scm.plugin.PluginManager;
 import sonia.scm.repository.RepositoryHandler;
 import sonia.scm.repository.RepositoryManager;
 import sonia.scm.store.StoreFactory;
-import sonia.scm.template.TemplateHandler;
 import sonia.scm.util.SecurityUtil;
 import sonia.scm.util.SystemUtil;
 import sonia.scm.web.security.WebSecurityContext;
@@ -56,9 +55,6 @@ import sonia.scm.web.security.WebSecurityContext;
 import com.sun.jersey.api.view.Viewable;
 
 import java.io.IOException;
-import java.io.StringWriter;
-
-import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -78,7 +74,7 @@ public class SupportResource
 {
 
   /** Field description */
-  public static final String TEMPLATE = "/templates/support.ftl";
+  public static final String TEMPLATE = "/templates/support.mustache";
 
   //~--- constructors ---------------------------------------------------------
 
diff --git a/scm-webapp/src/main/resources/templates/support.ftl b/scm-webapp/src/main/resources/templates/support.mustache
similarity index 73%
rename from scm-webapp/src/main/resources/templates/support.ftl
rename to scm-webapp/src/main/resources/templates/support.mustache
index f22f902d9a..822ac5e9d5 100644
--- a/scm-webapp/src/main/resources/templates/support.ftl
+++ b/scm-webapp/src/main/resources/templates/support.mustache
@@ -95,55 +95,55 @@
     <h2>Version</h2>
     
     <ul>
-      <li>Version: ${version.version}</li>
-      <li>Stage: ${version.stage}</li>
-      <li>StoreFactory: ${version.storeFactory}</li>
+      <li>Version: {{version.version}}</li>
+      <li>Stage: {{version.stage}}</li>
+      <li>StoreFactory: {{version.storeFactory}}</li>
     </ul>
     
     <h2>Configuration</h2>
     
     <ul>
-      <li>Anonymous Access Enabled: ${configuration.anonymousAccessEnabled?string}</li>
-      <li>Enable Proxy: ${configuration.enableProxy?string}</li>
-      <li>Force Base Url: ${configuration.forceBaseUrl?string}</li>
-      <li>Disable Grouping Grid: ${configuration.disableGroupingGrid?string}</li>
-      <li>Enable Repository Archive: ${configuration.enableRepositoryArchive?string}</li>
+      <li>Anonymous Access Enabled: {{configuration.anonymousAccessEnabled}}</li>
+      <li>Enable Proxy: {{configuration.enableProxy}}</li>
+      <li>Force Base Url: {{configuration.forceBaseUrl}}</li>
+      <li>Disable Grouping Grid: {{configuration.disableGroupingGrid}}</li>
+      <li>Enable Repository Archive: {{configuration.enableRepositoryArchive}}</li>
     </ul>
     
     <h2>Installed Plugins</h2>
     
     <ul>
-      <#list pluginManager.installed as plugin>
-      <li>${plugin.id}</li>
-      </#list>
+      {{#pluginManager.installed}}
+      <li>{{id}}</li>
+      {{/pluginManager.installed}}
     </ul>
     
     <h2>Runtime</h2>
     
     <ul>
-      <li>Free Memory: ${runtime.freeMemory}</li>
-      <li>Total Memory: ${runtime.totalMemory}</li>
-      <li>Max Memory: ${runtime.maxMemory}</li>
-      <li>Available Processors: ${runtime.availableProcessors}</li>
+      <li>Free Memory: {{runtime.freeMemory}}</li>
+      <li>Total Memory: {{runtime.totalMemory}}</li>
+      <li>Max Memory: {{runtime.maxMemory}}</li>
+      <li>Available Processors: {{runtime.availableProcessors}}</li>
     </ul>
     
     <h2>System</h2>
     
     <ul>
-      <li>OS: ${system.os}</li>
-      <li>Architecture: ${system.arch}</li>
-      <li>ServletContainer: ${system.container}</li>
-      <li>Java: ${system.java}</li>
-      <li>Local: ${system.locale}</li>
-      <li>TimeZone: ${system.timeZone}</li>
+      <li>OS: {{system.os}}</li>
+      <li>Architecture: {{system.arch}}</li>
+      <li>ServletContainer: {{system.container}}</li>
+      <li>Java: {{system.java}}</li>
+      <li>Local: {{system.locale}}</li>
+      <li>TimeZone: {{system.timeZone}}</li>
     </ul>
     
     <h2>Repository Handlers</h2>
     
     <ul>
-    <#list repositoryHandlers as handler>
-      <li>${handler.type.displayName}/${handler.type.name} (${handler.versionInformation})</li>
-    </#list>
+    {{#repositoryHandlers}}
+      <li>{{type.displayName}}/{{type.name}} ({{versionInformation}})</li>
+    {{/repositoryHandlers}}
     </ul>
     
   </body>