diff --git a/src/content/engine/1.5/index.html b/src/content/engine/1.5/index.html
index 7cd3feb..317ec91 100644
--- a/src/content/engine/1.5/index.html
+++ b/src/content/engine/1.5/index.html
@@ -397,7 +397,7 @@
           <a href="https://issues.apache.org/jira/browse/VELOCITY" class="externalLink">our bug tracker</a>. </li>
 
         <li>
-          <a href="http://wiki.apache.org/velocity/FrontPage" class="externalLink"> Our Wiki</a>
+          <a href="http://wiki.apache.org/velocity/velocity" class="externalLink"> Our Wiki</a>
           has a large collection of community written content. Add your own article or
           contribute to the FAQ! </li>
         <li> Read-only access to the Subversion repository is available both
diff --git a/src/content/engine/1.6.1/index.html b/src/content/engine/1.6.1/index.html
index 20d1a79..77cc5c1 100644
--- a/src/content/engine/1.6.1/index.html
+++ b/src/content/engine/1.6.1/index.html
@@ -396,7 +396,7 @@
 <li> There's a list of issues waiting to be addressed in
           <a class="externalLink" href="https://issues.apache.org/jira/browse/VELOCITY">our bug tracker</a>
 . </li>
-<li><a class="externalLink" href="http://wiki.apache.org/velocity/FrontPage"> Our Wiki</a>
+<li><a class="externalLink" href="http://wiki.apache.org/velocity/velocity"> Our Wiki</a>
 
           has a large collection of community written content. Add your own article or
           contribute to the FAQ! </li>
diff --git a/src/content/engine/1.6.2/index.html b/src/content/engine/1.6.2/index.html
index 7db6878..5ca4ae7 100644
--- a/src/content/engine/1.6.2/index.html
+++ b/src/content/engine/1.6.2/index.html
@@ -396,7 +396,7 @@
 <li> There's a list of issues waiting to be addressed in
           <a href="https://issues.apache.org/jira/browse/VELOCITY" class="externalLink">our bug tracker</a>
 . </li>
-<li><a href="http://wiki.apache.org/velocity/FrontPage" class="externalLink"> Our Wiki</a>
+<li><a href="http://wiki.apache.org/velocity/velocity" class="externalLink"> Our Wiki</a>
 
           has a large collection of community written content. Add your own article or
           contribute to the FAQ! </li>
diff --git a/src/content/engine/1.6/index.html b/src/content/engine/1.6/index.html
index 8a71550..8f5a3fa 100644
--- a/src/content/engine/1.6/index.html
+++ b/src/content/engine/1.6/index.html
@@ -396,7 +396,7 @@
 <li> There's a list of issues waiting to be addressed in
           <a href="https://issues.apache.org/jira/browse/VELOCITY" class="externalLink">our bug tracker</a>
 . </li>
-<li><a href="http://wiki.apache.org/velocity/FrontPage" class="externalLink"> Our Wiki</a>
+<li><a href="http://wiki.apache.org/velocity/velocity" class="externalLink"> Our Wiki</a>
 
           has a large collection of community written content. Add your own article or
           contribute to the FAQ! </li>
diff --git a/src/content/engine/1.7/index.mdtext b/src/content/engine/1.7/index.mdtext
index df3f0e9..3607f56 100644
--- a/src/content/engine/1.7/index.mdtext
+++ b/src/content/engine/1.7/index.mdtext
@@ -36,5 +36,5 @@
 
 + Report bugs, ask questions, and help new users on the [Velocity mailing lists](http://velocity.apache.org/contact.html).
 + There's a list of issues waiting to be addressed in [our bug tracker](https://issues.apache.org/jira/browse/VELOCITY).
-+ [Our wiki](http://wiki.apache.org/velocity/FrontPage) has a large collection of community written content. Add your own article or contribute to the FAQ!
++ [Our wiki](http://wiki.apache.org/velocity/velocity) has a large collection of community written content. Add your own article or contribute to the FAQ!
 + Read-only access to the Subversion repository is available both [online](http://svn.apache.org/repos/asf/velocity/engine/trunk/) and with a [Subversion client](http://www.apache.org/dev/version-control.html).
diff --git a/src/content/engine/2.0/index.mdtext b/src/content/engine/2.0/index.mdtext
index d50bb13..d0eec9a 100644
--- a/src/content/engine/2.0/index.mdtext
+++ b/src/content/engine/2.0/index.mdtext
@@ -36,5 +36,5 @@
 
 + Report bugs, ask questions, and help new users on the [Velocity mailing lists](http://velocity.apache.org/contact.html).
 + There's a list of issues waiting to be addressed in [our bug tracker](https://issues.apache.org/jira/browse/VELOCITY).
-+ [Our wiki](http://wiki.apache.org/velocity/FrontPage) has a large collection of community written content. Add your own article or contribute to the FAQ!
++ [Our wiki](http://wiki.apache.org/velocity/velocity) has a large collection of community written content. Add your own article or contribute to the FAQ!
 + Read-only access to the Subversion repository is available both [online](http://svn.apache.org/repos/asf/velocity/engine/trunk/) and with a [Subversion client](http://www.apache.org/dev/version-control.html).
diff --git a/src/content/engine/2.1/index.mdtext b/src/content/engine/2.1/index.mdtext
index 271cf31..fcde32b 100644
--- a/src/content/engine/2.1/index.mdtext
+++ b/src/content/engine/2.1/index.mdtext
@@ -36,5 +36,5 @@
 
 + Report bugs, ask questions, and help new users on the [Velocity mailing lists](http://velocity.apache.org/contact.html).
 + There's a list of issues waiting to be addressed in [our bug tracker](https://issues.apache.org/jira/browse/VELOCITY).
-+ [Our wiki](http://wiki.apache.org/velocity/FrontPage) has a large collection of community written content. Add your own article or contribute to the FAQ!
++ [Our wiki](http://wiki.apache.org/velocity/velocity) has a large collection of community written content. Add your own article or contribute to the FAQ!
 + Read-only access to the Subversion repository is available both [online](http://svn.apache.org/repos/asf/velocity/engine/trunk/) and with a [Subversion client](http://www.apache.org/dev/version-control.html).
diff --git a/src/content/engine/2.2/index.mdtext b/src/content/engine/2.2/index.mdtext
index 271cf31..fcde32b 100644
--- a/src/content/engine/2.2/index.mdtext
+++ b/src/content/engine/2.2/index.mdtext
@@ -36,5 +36,5 @@
 
 + Report bugs, ask questions, and help new users on the [Velocity mailing lists](http://velocity.apache.org/contact.html).
 + There's a list of issues waiting to be addressed in [our bug tracker](https://issues.apache.org/jira/browse/VELOCITY).
-+ [Our wiki](http://wiki.apache.org/velocity/FrontPage) has a large collection of community written content. Add your own article or contribute to the FAQ!
++ [Our wiki](http://wiki.apache.org/velocity/velocity) has a large collection of community written content. Add your own article or contribute to the FAQ!
 + Read-only access to the Subversion repository is available both [online](http://svn.apache.org/repos/asf/velocity/engine/trunk/) and with a [Subversion client](http://www.apache.org/dev/version-control.html).
diff --git a/src/content/engine/devel/index.mdtext b/src/content/engine/devel/index.mdtext
index 271cf31..fcde32b 100644
--- a/src/content/engine/devel/index.mdtext
+++ b/src/content/engine/devel/index.mdtext
@@ -36,5 +36,5 @@
 
 + Report bugs, ask questions, and help new users on the [Velocity mailing lists](http://velocity.apache.org/contact.html).
 + There's a list of issues waiting to be addressed in [our bug tracker](https://issues.apache.org/jira/browse/VELOCITY).
-+ [Our wiki](http://wiki.apache.org/velocity/FrontPage) has a large collection of community written content. Add your own article or contribute to the FAQ!
++ [Our wiki](http://wiki.apache.org/velocity/velocity) has a large collection of community written content. Add your own article or contribute to the FAQ!
 + Read-only access to the Subversion repository is available both [online](http://svn.apache.org/repos/asf/velocity/engine/trunk/) and with a [Subversion client](http://www.apache.org/dev/version-control.html).
diff --git a/src/content/left.nav b/src/content/left.nav
index 585599e..882a579 100644
--- a/src/content/left.nav
+++ b/src/content/left.nav
@@ -12,7 +12,7 @@
 * [Who we are](/who-we-are.html)
 * [Contact us](/contact.html)
 * [Get involved](/get-involved.html)
-* [Wiki](http://wiki.apache.org/velocity/FrontPage)
+* [Wiki](http://wiki.apache.org/velocity/velocity)
 * [How it works](/how-it-works.html)
 * [Board Reports](https://whimsy.apache.org/board/minutes/Velocity.html)
 ## Developer Resources