diff --git a/index/index.rst b/index/index.rst
index 3a7cd7c76..aa84d1bce 100644
--- a/index/index.rst
+++ b/index/index.rst
@@ -2,6 +2,27 @@
 Documentation Overview
 ======================
 
+-----------------------------------------
+Development Version - ownCloud Server 8.0
+-----------------------------------------
+
+This documents the *development* version of ownCloud. Do not use for production!
+
+* `User Manual <http://doc.owncloud.org/server/8.0/user_manual/>`_ (`Download 
+  PDF <http://doc.owncloud.org/server/8.0/ownCloudUserManual.pdf>`_)
+* `Administrator Manual <http://doc.owncloud.org/server/8.0/admin_manual/>`_ (`Download PDF 
+  <http://doc.owncloud.org/server/8.0/ownCloudAdminManual.pdf>`_)
+* `Developer Manual <http://doc.owncloud.org/server/8.0/developer_manual/>`_ (`Download PDF 
+  <http://doc.owncloud.org/server/8.0/ownCloudDeveloperManual.pdf>`_)
+
+.. Uncomment this section and push when the 1.8 client is released
+.. ---------------------------
+.. ownCloud Desktop Client 1.8
+.. ---------------------------
+
+.. * `ownCloud Desktop Client Manual <http://doc.owncloud.org/desktop/1.8/>`_ (`Download PDF 
+..   <http://doc.owncloud.org/desktop/1.8/ownCloudClientManual.pdf>`_)
+
 -------------------
 ownCloud Server 7.0
 -------------------
@@ -13,6 +34,13 @@ This documents the *latest* ownCloud release, suitable for production use.
 * `Developer Manual <http://doc.owncloud.org/server/7.0/developer_manual/>`_ (`Download PDF <http://doc.owncloud.org/server/7.0/ownCloudDeveloperManual.pdf>`_)
 * `ownCloud Videos <http://doc.owncloud.org/server/7.0/admin_manual/videos.html>`_
 
+---------------------------
+ownCloud Desktop Client 1.7
+---------------------------
+
+* `ownCloud Desktop Client Manual <http://doc.owncloud.org/desktop/1.7/>`_ (`Download PDF 
+  <http://doc.owncloud.org/desktop/1.7/ownCloudClientManual.pdf>`_)
+
 -------------------
 ownCloud Server 6.0
 -------------------
@@ -32,20 +60,3 @@ This documents the *deprecated* ownCloud release.
 * `User Manual <http://doc.owncloud.org/server/5.0/user_manual/>`_ (`Download PDF <http://doc.owncloud.org/server/5.0/ownCloudUserManual.pdf>`_)
 * `Administrator Manual <http://doc.owncloud.org/server/5.0/admin_manual/>`_ (`Download PDF <http://doc.owncloud.org/server/5.0/ownCloudAdminManual.pdf>`_)
 * `Developer Manual <http://doc.owncloud.org/server/5.0/developer_manual/>`_ (`Download PDF <http://doc.owncloud.org/server/5.0/ownCloudDeveloperManual.pdf>`_)
-
----------------------------
-ownCloud Desktop Client 1.7
----------------------------
-
-* `ownCloud Desktop Client Manual <http://doc.owncloud.org/desktop/1.7/>`_ (`Download PDF <http://doc.owncloud.org/desktop/1.7/ownCloudClientManual.pdf>`_)
-
------------------------------------------
-Development Version - ownCloud Server 8.0
------------------------------------------
-
-This documents the *development* version of ownCloud. Do not use for production!
-
-* `User Manual <http://doc.owncloud.org/server/8.0/user_manual/>`_ (`Download PDF <http://doc.owncloud.org/server/8.0/ownCloudUserManual.pdf>`_)
-* `Administrator Manual <http://doc.owncloud.org/server/8.0/admin_manual/>`_ (`Download PDF <http://doc.owncloud.org/server/8.0/ownCloudAdminManual.pdf>`_)
-* `Developer Manual <http://doc.owncloud.org/server/8.0/developer_manual/>`_ (`Download PDF <http://doc.owncloud.org/server/8.0/ownCloudDeveloperManual.pdf>`_)
-