diff --git a/10-minute-tutorial.html.vtl b/10-minute-tutorial.html.vtl
index 49dd68e60d..aa8d8b7470 100644
--- a/10-minute-tutorial.html.vtl
+++ b/10-minute-tutorial.html.vtl
@@ -1,4 +1,4 @@
-#parse("templates/macros.vtl")
+#parse("templates/includes.vtl")
 
 <h1><a name="10MinuteTutorial-10MinuteTutorialonApacheShiro"></a>10 Minute Tutorial on Apache Shiro</h1>
 
@@ -51,13 +51,13 @@
 <ol>
     <li>Ensure you have JDK 1.6+ and Maven 3.0.3+ installed.</li>
     <li>Download the lastest "Source Code Distribution" from the <a href="download.html" title="Download">Download</a>
-        page. In this example, we're using the 1.3.2 release distribution.
+        page. In this example, we're using the ${latestRelease} release distribution.
     </li>
     <li>Unzip the source package:
         <div class="code panel" style="border-width: 1px;">
             <div class="codeContent panelContent">
 <pre class="code-java">
-&gt; unzip shiro-root-1.3.2-source-release.zip
+&gt; unzip shiro-root-${latestRelease}-source-release.zip
 </pre>
             </div>
         </div>
@@ -66,7 +66,7 @@
         <div class="code panel" style="border-width: 1px;">
             <div class="codeContent panelContent">
 <pre class="code-java">
-&gt; cd shiro-root-1.3.2/samples/quickstart
+&gt; cd shiro-root-${latestRelease}/samples/quickstart
 </pre>
             </div>
         </div>
diff --git a/documentation.html b/documentation.html.vtl
similarity index 89%
rename from documentation.html
rename to documentation.html.vtl
index 99132e5725..e04ab1c166 100644
--- a/documentation.html
+++ b/documentation.html.vtl
@@ -1,3 +1,5 @@
+#parse("templates/includes.vtl")
+
 <h1><a name="Documentation-ApacheShiroDocumentation"></a>Apache Shiro Documentation</h1>
 
 <h3><a name="Documentation-Introduction"></a>Introduction</h3>
@@ -28,11 +30,11 @@ <h3><a name="Documentation-GuidesimportantShiroconcepts%3A"></a>Guides - importa
 </ul>
 
 <h3><a name="Documentation-CurrentRelease"></a>Current Release</h3>
-<p>Apache Shiro 1.3.2 (<a href="download.html" title="Download">Download</a>)</p>
+<p>Apache Shiro ${latestRelease} (<a href="download.html" title="Download">Download</a>)</p>
 <ul>
-    <li><a class="external-link" href="static/1.3.2/apidocs">API</a> (JavaDoc)</li>
-    <li><a class="external-link" href="static/1.3.2/xref/">Browse Source</a> (XREF)</li>
-    <li><a class="external-link" href="static/1.3.2/">Maven Static Site</a></li>
+    <li><a class="external-link" href="static/${latestRelease}/apidocs">API</a> (JavaDoc)</li>
+    <li><a class="external-link" href="static/${latestRelease}/xref/">Browse Source</a> (XREF)</li>
+    <li><a class="external-link" href="static/${latestRelease}/">Maven Static Site</a></li>
 <!--    <li><a class="external-link"
            href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310950&version=12323469&amp;styleName=Html&amp;projectId=12310950">Release
         Notes</a></li> -->
diff --git a/download.html b/download.html.vtl
similarity index 94%
rename from download.html
rename to download.html.vtl
index fe360b8071..94a9733529 100644
--- a/download.html
+++ b/download.html.vtl
@@ -1,3 +1,5 @@
+#parse("templates/includes.vtl")
+
 <h1><a name="Download-DownloadApacheShiro"></a>Download Apache Shiro</h1>
 
 <table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
@@ -27,7 +29,7 @@ <h3><a href="java-authorization-guide.html">Java Authorization Guide</a></h3>
 </tr>
 </table>
 
-<p>Apache Shiro 1.3.2 is the current stable release (Java 1.6+ JVM).</p>
+<p>Apache Shiro ${latestRelease} is the current stable release (Java 1.6+ JVM).</p>
 
 <p>To download Shiro please follow the instructions below.</p>
 
@@ -43,11 +45,11 @@ <h3>Releases</h3>
 <div>
     <ul>
         <li>
-            <a href="#latest">Latest Stable Release (1.3.2)</a>
+            <a href="#latest">Latest Stable Release (${latestRelease})</a>
             <ul>
-                <li><a href="#latestBinary">1.3.2 Binary Distribution</a></li>
-                <li><a href="#latestSource">1.3.2 Source Code Distribution</a></li>
-                <li><a href="#latestGit">1.3.2 Git Source repository</a></li>
+                <li><a href="#latestBinary">${latestRelease} Binary Distribution</a></li>
+                <li><a href="#latestSource">${latestRelease} Source Code Distribution</a></li>
+                <li><a href="#latestGit">${latestRelease} Git Source repository</a></li>
             </ul>
         </li>
         <li><a href="#previous">Previous Releases</a>
@@ -72,9 +74,9 @@ <h3>Releases</h3>
 </div>
 
 
-<h2><a name="latest"></a>Latest Stable Release (1.3.2)</h2>
+<h2><a name="latest"></a>Latest Stable Release (${latestRelease})</h2>
 
-<h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
+<h3><a name="latestBinary"></a>${latestRelease} Binary Distribution</h3>
 
 <p>Associated documentation can be found <a href="documentation.html" title="Documentation">here</a></p>
 
@@ -94,7 +96,7 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-all/1.3.2/shiro-all-1.3.2.jar">shiro-all</a></td>
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-all/${latestRelease}/shiro-all-${latestRelease}.jar">shiro-all</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd"><b>Not Recommended</b></td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Includes all binary functionality for Shiro (without
                     dependencies), useful in certain build environments (e.g. Ant). However, this is <b>NOT</b>
@@ -105,14 +107,14 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-core/1.3.2/shiro-core-1.3.2.jar">shiro-core</a></td>
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-core/${latestRelease}/shiro-core-${latestRelease}.jar">shiro-core</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-core&lt;/artifactId&gt;
-  &lt;version&gt;1.3.2&lt;/version&gt;
+  &lt;version&gt;${latestRelease}&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -125,14 +127,14 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-web/1.3.2/shiro-web-1.3.2.jar">shiro-web</a></td>
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-web/${latestRelease}/shiro-web-${latestRelease}.jar">shiro-web</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-web&lt;/artifactId&gt;
-  &lt;version&gt;1.3.2&lt;/version&gt;
+  &lt;version&gt;${latestRelease}&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -141,14 +143,14 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-aspectj/1.3.2/shiro-aspectj-1.3.2.jar">shiro-aspectj</a></td>
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-aspectj/${latestRelease}/shiro-aspectj-${latestRelease}.jar">shiro-aspectj</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-aspectj&lt;/artifactId&gt;
-  &lt;version&gt;1.3.2&lt;/version&gt;
+  &lt;version&gt;${latestRelease}&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -160,14 +162,14 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-cas/1.3.2/shiro-cas-1.3.2.jar">shiro-cas</a></td>
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-cas/${latestRelease}/shiro-cas-${latestRelease}.jar">shiro-cas</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-cas&lt;/artifactId&gt;
-  &lt;version&gt;1.3.2&lt;/version&gt;
+  &lt;version&gt;${latestRelease}&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -182,14 +184,14 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-ehcache/1.3.2/shiro-ehcache-1.3.2.jar">shiro-ehcache</a></td>
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-ehcache/${latestRelease}/shiro-ehcache-${latestRelease}.jar">shiro-ehcache</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-ehcache&lt;/artifactId&gt;
-  &lt;version&gt;1.3.2&lt;/version&gt;
+  &lt;version&gt;${latestRelease}&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -202,14 +204,14 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
             
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-hazelcast/1.3.2/shiro-hazelcast-1.3.2.jar">shiro-hazelcast</a></td>
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-hazelcast/${latestRelease}/shiro-hazelcast-${latestRelease}.jar">shiro-hazelcast</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-hazelcast&lt;/artifactId&gt;
-  &lt;version&gt;1.3.2&lt;/version&gt;
+  &lt;version&gt;${latestRelease}&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -221,14 +223,14 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-features/1.3.2/shiro-features-1.3.2-features.xml">shiro-features</a></td>
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-features/${latestRelease}/shiro-features-${latestRelease}-features.xml">shiro-features</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-features&lt;/artifactId&gt;
-  &lt;version&gt;1.3.2&lt;/version&gt;
+  &lt;version&gt;${latestRelease}&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -240,14 +242,14 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-guice/1.3.2/shiro-guice-1.3.2.jar">shiro-guice</a></td>
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-guice/${latestRelease}/shiro-guice-${latestRelease}.jar">shiro-guice</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-guice&lt;/artifactId&gt;
-  &lt;version&gt;1.3.2&lt;/version&gt;
+  &lt;version&gt;${latestRelease}&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -259,14 +261,14 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-quartz/1.3.2/shiro-quartz-1.3.2.jar">shiro-quartz</a></td>
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-quartz/${latestRelease}/shiro-quartz-${latestRelease}.jar">shiro-quartz</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-quartz&lt;/artifactId&gt;
-  &lt;version&gt;1.3.2&lt;/version&gt;
+  &lt;version&gt;${latestRelease}&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -278,14 +280,14 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-spring/1.3.2/shiro-spring-1.3.2.jar">shiro-spring</a></td>
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-spring/${latestRelease}/shiro-spring-${latestRelease}.jar">shiro-spring</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-spring&lt;/artifactId&gt;
-  &lt;version&gt;1.3.2&lt;/version&gt;
+  &lt;version&gt;${latestRelease}&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -297,7 +299,7 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/tools/shiro-tools-hasher/1.3.2/shiro-tools-hasher-1.3.2-cli.jar">shiro-tools-hasher-cli</a></td>
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/tools/shiro-tools-hasher/${latestRelease}/shiro-tools-hasher-${latestRelease}-cli.jar">shiro-tools-hasher-cli</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd"><b>Not Relevant</b></td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> A command-line program to perform hashing (MD5, SHA,
                     etc) for files, streams and passwords. Note that this is a command line program and not intended to
@@ -306,7 +308,7 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">
-java -jar shiro-tools-hasher-1.3.2-cli.jar
+java -jar shiro-tools-hasher-${latestRelease}-cli.jar
 </pre>
                         </div>
                     </div>
@@ -317,27 +319,27 @@ <h3><a name="latestBinary"></a>1.3.2 Binary Distribution</h3>
 </div>
 
 
-<h3><a name="latestSource"></a>1.3.2 Source Code Distribution</h3>
+<h3><a name="latestSource"></a>${latestRelease} Source Code Distribution</h3>
 
 <p>The source bundle requires JDK 1.6 and Maven 3.0.3+ to build:</p>
 
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/1.3.2/shiro-root-1.3.2-source-release.zip">zip</a>
+<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip">zip</a>
     (<a class="external-link"
-        href="http://www.apache.org/dyn/closer.cgi/shiro/1.3.2/shiro-root-1.3.2-source-release.zip.asc">pgp</a>, <a
+        href="http://www.apache.org/dyn/closer.cgi/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip.asc">pgp</a>, <a
             class="external-link"
-            href="http://www.apache.org/dyn/closer.cgi/shiro/1.3.2/shiro-root-1.3.2-source-release.zip.md5">md5</a>, <a
+            href="http://www.apache.org/dyn/closer.cgi/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip.md5">md5</a>, <a
             class="external-link"
-            href="http://www.apache.org/dyn/closer.cgi/shiro/1.3.2/shiro-root-1.3.2-source-release.zip.sha1">sha1</a>)
+            href="http://www.apache.org/dyn/closer.cgi/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip.sha1">sha1</a>)
 </p>
 
-<h3><a name="latestGit"></a>1.3.2 Git Source repository</h3>
+<h3><a name="latestGit"></a>${latestRelease} Git Source repository</h3>
 
 <p>The source can be cloned anonymously from Git with this command:</p>
 <div class="code panel" style="border-width: 1px;">
     <div class="codeContent panelContent">
 <pre class="code-java">
 git clone https:<span class="code-comment">//github.com/apache/shiro.git</span>
-git checkout shiro-root-1.3.2 -b shiro-root-1.3.2
+git checkout shiro-root-${latestRelease} -b shiro-root-${latestRelease}
 </pre>
     </div>
 </div>
diff --git a/templates/default.vtl b/templates/default.vtl
index 3651a9213e..fb5a7818c5 100644
--- a/templates/default.vtl
+++ b/templates/default.vtl
@@ -16,7 +16,7 @@
 -->
 <html>
 
-#parse("templates/macros.vtl")
+#parse("templates/includes.vtl")
 
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
diff --git a/templates/macros.vtl b/templates/includes.vtl
similarity index 72%
rename from templates/macros.vtl
rename to templates/includes.vtl
index 7d9b83edc9..359060a2b4 100644
--- a/templates/macros.vtl
+++ b/templates/includes.vtl
@@ -3,4 +3,6 @@
 #parse( "templates/macros/tip.vtl" )
 #parse( "templates/macros/warning.vtl" )
 #parse( "templates/macros/lend-a-hand.vtl" )
-#parse( "templates/macros/redirect.vtl" )
\ No newline at end of file
+#parse( "templates/macros/redirect.vtl" )
+
+#parse( "templates/versions.vtl" )
\ No newline at end of file
diff --git a/templates/versions.vtl b/templates/versions.vtl
new file mode 100644
index 0000000000..aa2f42be02
--- /dev/null
+++ b/templates/versions.vtl
@@ -0,0 +1,2 @@
+#set( $latestRelease = "1.3.2" )
+#set( $versionInfo = {"1.3.2": { "releaseDate": "2016-09-12" } } )
\ No newline at end of file