diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84314e5..9d3fb6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.0.0 - TBC
+
+First stable release.
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#69](https://github.com/zendframework/zend-expressive-skeleton/pull/69)
+  updates the links in templates to point to the new documentation site on
+  https://zendframework.github.io/zend-expressive/ instead of rtfd.org.
+
 ## 1.0.0rc8 - 2016-01-21
 
 Eighth release candidate.
diff --git a/src/ExpressiveInstaller/Resources/templates/plates-home-page.phtml b/src/ExpressiveInstaller/Resources/templates/plates-home-page.phtml
index 0f55eba..561605b 100644
--- a/src/ExpressiveInstaller/Resources/templates/plates-home-page.phtml
+++ b/src/ExpressiveInstaller/Resources/templates/plates-home-page.phtml
@@ -15,7 +15,7 @@
 <div class="row">
     <div class="col-md-4">
         <h2>
-            <a href="https://zend-expressive.readthedocs.org/en/latest/features/" target="_blank">
+            <a href="https://zendframework.github.io/zend-expressive/getting-started/features/" target="_blank">
                 <i class="fa fa-refresh"></i> Agile &amp; Lean
             </a>
         </h2>
@@ -56,7 +56,7 @@
 <div class="row">
     <div class="col-md-4">
         <h2>
-            <a href="https://zend-expressive.readthedocs.org/en/latest/container/intro/" target="_blank">
+            <a href="https://zendframework.github.io/zend-expressive/features/container/intro/" target="_blank">
                 <i class="fa fa-cube"></i> Containers
             </a>
         </h2>
@@ -69,7 +69,7 @@
 
     <div class="col-md-4">
         <h2>
-            <a href="https://zend-expressive.readthedocs.org/en/latest/router/intro/" target="_blank">
+            <a href="https://zendframework.github.io/zend-expressive/features/router/intro/" target="_blank">
                 <i class="fa fa-plane"></i> Routers
             </a>
         </h2>
@@ -88,7 +88,7 @@
 
     <div class="col-md-4">
         <h2>
-            <a href="https://zend-expressive.readthedocs.org/en/latest/template/twig/" target="_blank">
+            <a href="https://zendframework.github.io/zend-expressive/features/template/plates/" target="_blank">
                 <i class="fa fa-files-o"></i> Templating
             </a>
         </h2>
diff --git a/src/ExpressiveInstaller/Resources/templates/plates-layout.phtml b/src/ExpressiveInstaller/Resources/templates/plates-layout.phtml
index 1023e4f..05aa823 100644
--- a/src/ExpressiveInstaller/Resources/templates/plates-layout.phtml
+++ b/src/ExpressiveInstaller/Resources/templates/plates-layout.phtml
@@ -33,7 +33,7 @@
             <div class="collapse navbar-collapse">
                 <ul class="nav navbar-nav">
                     <li>
-                        <a href="https://zend-expressive.readthedocs.org/en/latest" target="_blank">
+                        <a href="https://zendframework.github.io/zend-expressive/" target="_blank">
                             <i class="fa fa-book"></i> Docs
                         </a>
                     </li>
diff --git a/src/ExpressiveInstaller/Resources/templates/twig-home-page.html.twig b/src/ExpressiveInstaller/Resources/templates/twig-home-page.html.twig
index 0835aa3..fc793c1 100644
--- a/src/ExpressiveInstaller/Resources/templates/twig-home-page.html.twig
+++ b/src/ExpressiveInstaller/Resources/templates/twig-home-page.html.twig
@@ -18,7 +18,7 @@
     <div class="row">
         <div class="col-md-4">
             <h2>
-                <a href="https://zend-expressive.readthedocs.org/en/latest/features/" target="_blank">
+                <a href="https://zendframework.github.io/zend-expressive/getting-started/features/" target="_blank">
                     <i class="fa fa-refresh"></i> Agile &amp; Lean
                 </a>
             </h2>
@@ -59,7 +59,7 @@
     <div class="row">
         <div class="col-md-4">
             <h2>
-                <a href="https://zend-expressive.readthedocs.org/en/latest/container/intro/" target="_blank">
+                <a href="https://zendframework.github.io/zend-expressive/features/container/intro/" target="_blank">
                     <i class="fa fa-cube"></i> Containers
                 </a>
             </h2>
@@ -72,7 +72,7 @@
 
         <div class="col-md-4">
             <h2>
-                <a href="https://zend-expressive.readthedocs.org/en/latest/router/intro/" target="_blank">
+                <a href="https://zendframework.github.io/zend-expressive/features/router/intro/" target="_blank">
                     <i class="fa fa-plane"></i> Routers
                 </a>
             </h2>
@@ -91,7 +91,7 @@
 
         <div class="col-md-4">
             <h2>
-                <a href="https://zend-expressive.readthedocs.org/en/latest/template/twig/" target="_blank">
+                <a href="https://zendframework.github.io/zend-expressive/features/template/twig/" target="_blank">
                     <i class="fa fa-files-o"></i> Templating
                 </a>
             </h2>
diff --git a/src/ExpressiveInstaller/Resources/templates/twig-layout.html.twig b/src/ExpressiveInstaller/Resources/templates/twig-layout.html.twig
index 4466e78..163e643 100644
--- a/src/ExpressiveInstaller/Resources/templates/twig-layout.html.twig
+++ b/src/ExpressiveInstaller/Resources/templates/twig-layout.html.twig
@@ -33,7 +33,7 @@
                 <div class="collapse navbar-collapse">
                     <ul class="nav navbar-nav">
                         <li>
-                            <a href="https://zend-expressive.readthedocs.org/en/latest" target="_blank">
+                            <a href="https://zendframework.github.io/zend-expressive/" target="_blank">
                                 <i class="fa fa-book"></i> Docs
                             </a>
                         </li>
diff --git a/src/ExpressiveInstaller/Resources/templates/zend-view-home-page.phtml b/src/ExpressiveInstaller/Resources/templates/zend-view-home-page.phtml
index b8eed8d..3f06316 100644
--- a/src/ExpressiveInstaller/Resources/templates/zend-view-home-page.phtml
+++ b/src/ExpressiveInstaller/Resources/templates/zend-view-home-page.phtml
@@ -15,7 +15,7 @@
 <div class="row">
     <div class="col-md-4">
         <h2>
-            <a href="https://zend-expressive.readthedocs.org/en/latest/features/" target="_blank">
+            <a href="https://zendframework.github.io/zend-expressive/getting-started/features/" target="_blank">
                 <i class="fa fa-refresh"></i> Agile &amp; Lean
             </a>
         </h2>
@@ -56,7 +56,7 @@
 <div class="row">
     <div class="col-md-4">
         <h2>
-            <a href="https://zend-expressive.readthedocs.org/en/latest/container/intro/" target="_blank">
+            <a href="https://zendframework.github.io/zend-expressive/features/container/intro/" target="_blank">
                 <i class="fa fa-cube"></i> Containers
             </a>
         </h2>
@@ -69,7 +69,7 @@
 
     <div class="col-md-4">
         <h2>
-            <a href="https://zend-expressive.readthedocs.org/en/latest/router/intro/" target="_blank">
+            <a href="https://zendframework.github.io/zend-expressive/features/router/intro/" target="_blank">
                 <i class="fa fa-plane"></i> Routers
             </a>
         </h2>
@@ -88,7 +88,7 @@
 
     <div class="col-md-4">
         <h2>
-            <a href="https://zend-expressive.readthedocs.org/en/latest/template/twig/" target="_blank">
+            <a href="https://zendframework.github.io/zend-expressive/features/template/zend-view/" target="_blank">
                 <i class="fa fa-files-o"></i> Templating
             </a>
         </h2>
diff --git a/src/ExpressiveInstaller/Resources/templates/zend-view-layout.phtml b/src/ExpressiveInstaller/Resources/templates/zend-view-layout.phtml
index f1b26e0..936d8a1 100644
--- a/src/ExpressiveInstaller/Resources/templates/zend-view-layout.phtml
+++ b/src/ExpressiveInstaller/Resources/templates/zend-view-layout.phtml
@@ -41,7 +41,7 @@ $this->inlineScript()
                 <div class="collapse navbar-collapse">
                     <ul class="nav navbar-nav">
                         <li>
-                            <a href="https://zend-expressive.readthedocs.org/en/latest" target="_blank">
+                            <a href="https://zendframework.github.io/zend-expressive/" target="_blank">
                                 <i class="fa fa-book"></i> Docs
                             </a>
                         </li>