diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
index a57c8ed47a..22de2c60aa 100644
--- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
+++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
@@ -50,7 +50,7 @@ protected DecoratorSelector initDecoratorSelector(SiteMeshWebAppContext webAppCo
         // TODO: Remove heavy coupling on horrible SM2 Factory
         Factory factory = Factory.getInstance(new Config(filterConfig));
         factory.refresh();
-        return new FreemarkerMapper2DecoratorSelector(factory.getDecoratorMapper());
+        return new VelocityMapper2DecoratorSelector(factory.getDecoratorMapper());
     }
 
 }
diff --git a/plugins/sitemesh/src/main/resources/struts-plugin.xml b/plugins/sitemesh/src/main/resources/struts-plugin.xml
index c5fcd5d880..406a73a0f3 100644
--- a/plugins/sitemesh/src/main/resources/struts-plugin.xml
+++ b/plugins/sitemesh/src/main/resources/struts-plugin.xml
@@ -22,8 +22,9 @@
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
 	"http://struts.apache.org/dtds/struts-2.5.dtd">
-    
+
 <struts>
     <bean class="org.apache.struts2.sitemesh.FreemarkerPageFilter" static="true" optional="true"/>
-    <bean class="org.apache.struts2.sitemesh.VelocityPageFilter" static="true" optional="true"/>
+    <!-- if you want to use Velocity with Sitemesh, please define this bean in your struts.xml -->
+    <!-- bean class="org.apache.struts2.sitemesh.VelocityPageFilter" static="true" optional="true"/ -->
 </struts>