diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index a28f77bba..346fb1a93 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -109,6 +109,10 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-portlet-tiles-plugin</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.velocity</groupId>
diff --git a/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml b/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml
similarity index 100%
rename from src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml
rename to apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml
diff --git a/src/main/resources/struts-tiles.xml b/apps/portlet/src/main/resources/struts-tiles.xml
similarity index 100%
rename from src/main/resources/struts-tiles.xml
rename to apps/portlet/src/main/resources/struts-tiles.xml
diff --git a/apps/portlet/src/main/resources/struts.xml b/apps/portlet/src/main/resources/struts.xml
index bbdb26000..ae41f3707 100644
--- a/apps/portlet/src/main/resources/struts.xml
+++ b/apps/portlet/src/main/resources/struts.xml
@@ -8,4 +8,5 @@
     <include file="struts-edit.xml"/>
     <include file="struts-help.xml"/>
     <include file="struts-eventing.xml"/>
+    <include file="struts-tiles.xml"/>
 </struts>
diff --git a/src/main/webapp/WEB-INF/tiles.xml b/apps/portlet/src/main/webapp/WEB-INF/tiles.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/tiles.xml
rename to apps/portlet/src/main/webapp/WEB-INF/tiles.xml
diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
index d7ad46784..217b158af 100644
--- a/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
+++ b/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
@@ -12,6 +12,7 @@ Here you'll find examples of what is possible with the Struts Portlet integratio
 <li><a href="<s:url action="fileUpload" method="input"/>">File upload</li>
 <li><a href="<s:url action="freeMarkerExample"/>">FreeMarker</a></li>
 <li><a href="<s:url action="velocityHelloWorld"/>">Velocity</a></li>
+<li><a href="<s:url action="index" namespace="/tiles"/>">Form Example Validation with Tiles</a></li>
 <li><a href="<s:url action="index" portletMode="edit"/>">Go to edit mode and see what's there</a></li>
 <li><a href="<s:url action="index" portletMode="help"/>">Go to help mode and see what's there</a></li>
 </ul>
diff --git a/apps/portlet/src/main/webapp/WEB-INF/web.xml b/apps/portlet/src/main/webapp/WEB-INF/web.xml
index ff7019458..f42441989 100644
--- a/apps/portlet/src/main/webapp/WEB-INF/web.xml
+++ b/apps/portlet/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app id="StrutsPortlet">
+
+    <context-param>
+        <param-name>org.apache.tiles.factory.TilesContainerFactory</param-name>
+        <param-value>org.apache.struts2.tiles.StrutsTilesContainerFactory</param-value>
+    </context-param>
+    <context-param>
+        <param-name>org.apache.tiles.impl.BasicTilesContainer.DEFINITIONS_CONFIG</param-name>
+        <param-value>/WEB-INF/tiles.xml</param-value>
+    </context-param>
+
 	<!-- Uncomment/comment this if you need/don't need Spring support -->
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
@@ -12,4 +22,10 @@
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
 
+    <!-- Tiles Plugin -->
+    <listener>
+    	<listener-class>org.apache.struts2.tiles.StrutsTilesListener
+    	</listener-class>
+    </listener>
+
 </web-app>
diff --git a/src/main/webapp/WEB-INF/tiles/footer.ftl b/apps/portlet/src/main/webapp/tiles/footer.ftl
similarity index 100%
rename from src/main/webapp/WEB-INF/tiles/footer.ftl
rename to apps/portlet/src/main/webapp/tiles/footer.ftl
diff --git a/src/main/webapp/WEB-INF/tiles/footer.jsp b/apps/portlet/src/main/webapp/tiles/footer.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/tiles/footer.jsp
rename to apps/portlet/src/main/webapp/tiles/footer.jsp
diff --git a/src/main/webapp/WEB-INF/tiles/formExample.jsp b/apps/portlet/src/main/webapp/tiles/formExample.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/tiles/formExample.jsp
rename to apps/portlet/src/main/webapp/tiles/formExample.jsp
diff --git a/src/main/webapp/WEB-INF/tiles/formExampleInputValidation.jsp b/apps/portlet/src/main/webapp/tiles/formExampleInputValidation.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/tiles/formExampleInputValidation.jsp
rename to apps/portlet/src/main/webapp/tiles/formExampleInputValidation.jsp
diff --git a/src/main/webapp/WEB-INF/tiles/header.jsp b/apps/portlet/src/main/webapp/tiles/header.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/tiles/header.jsp
rename to apps/portlet/src/main/webapp/tiles/header.jsp
diff --git a/src/main/webapp/WEB-INF/tiles/index.jsp b/apps/portlet/src/main/webapp/tiles/index.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/tiles/index.jsp
rename to apps/portlet/src/main/webapp/tiles/index.jsp
diff --git a/src/main/webapp/WEB-INF/tiles/layout.jsp b/apps/portlet/src/main/webapp/tiles/layout.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/tiles/layout.jsp
rename to apps/portlet/src/main/webapp/tiles/layout.jsp
diff --git a/pom.xml b/pom.xml
index 12631e10f..cff66f7be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -346,6 +346,11 @@
                 <artifactId>struts2-dwr-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-portlet-tiles-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-junit-plugin</artifactId>