diff --git a/doc/source/index.rst b/doc/source/index.rst
index e95915d..69b108a 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -12,16 +12,20 @@ infrastructure developers.
 .. toctree::
    :maxdepth: 1
 
-   specs/logs-in-swift
+   specs/ansible_puppet_apply
    specs/dib-nodepool
-   specs/openstackci
+   specs/gerrit-2.11
+   specs/infra-cloud
+   specs/logs-in-swift
    specs/maniphest
+   specs/openstackci
+   specs/zuulv3
 
 Gerrit query for all changes related to priority efforts::
 
-  status:open AND (topic:enable_swift OR topic:dib-nodepool OR topic:downstream-puppet OR topic:maniphest OR topic:gerrit-upgrade)
+  status:open AND (topic:puppet-apply OR topic:dib-nodepool OR topic:gerrit-upgrade OR topic:infra-cloud OR topic:enable_swift OR topic:maniphest OR topic:downstream-puppet OR branch:feature/zuulv3)
 
-https://review.openstack.org/#/q/status:open+AND+%28topic:enable_swift+OR+topic:dib-nodepool+OR+topic:downstream-puppet+OR+topic:maniphest+OR+topic:gerrit-upgrade%29,n,z
+https://review.openstack.org/#/q/status:open+AND+%28topic:puppet-apply+OR+topic:dib-nodepool+OR+topic:gerrit-upgrade+OR+topic:infra-cloud+OR+topic:enable_swift+OR+topic:maniphest+OR+topic:downstream-puppet+OR+branch:feature/zuulv3%29,n,z
 
 Approved Design Specifications
 ==============================
@@ -34,13 +38,11 @@ permits.
    :glob:
    :maxdepth: 1
 
-   specs/ansible_puppet_apply
    specs/artifact-signing
    specs/centralize-release-tagging
    specs/code-search
    specs/deploy-ci-dashboard
    specs/doc-publishing
-   specs/infra-cloud
    specs/jenkins-job-builder_2.0.0-api-changes
    specs/nodepool-launch-workers
    specs/nodepool-workers
@@ -57,7 +59,6 @@ permits.
    specs/storyboard_worklists_boards
    specs/translation_check_site
    specs/zuul_split
-   specs/zuulv3
 
 Implemented Design Specifications
 =================================
diff --git a/specs/gerrit-2.11.rst b/specs/gerrit-2.11.rst
new file mode 100644
index 0000000..f3cd447
--- /dev/null
+++ b/specs/gerrit-2.11.rst
@@ -0,0 +1,90 @@
+::
+
+  Copyright 2015 OpenStack Foundation
+
+  This work is licensed under a Creative Commons Attribution 3.0
+  Unported License.
+  http://creativecommons.org/licenses/by/3.0/legalcode
+
+===================
+Gerrit 2.11 Upgrade
+===================
+
+We will upgrade our current Gerrit 2.8 production instance to 2.11.
+
+Problem Description
+===================
+
+Our prior upgrade from 2.8 to 2.10 was reverted due to a bug which
+caused repositories to be marked corrupt under load. This is now
+suspected fixed but has resulted in us falling well behind in Gerrit
+releases.
+
+Proposed Change
+===============
+
+Upgrade to Gerrit 2.11 in a maintenance window.
+
+Alternatives
+------------
+
+Stay on 2.8 and fork or go without useful new fixes/features.
+
+Implementation
+==============
+
+Assignee(s)
+-----------
+
+Primary assignee:
+  zaro
+
+
+Gerrit Topic
+------------
+
+Use Gerrit topic "gerrit-upgrade" for all patches related to this spec.
+
+.. code-block:: bash
+
+    git-review -t gerrit-upgrade
+
+Work Items
+----------
+
+N/A
+
+Repositories
+------------
+
+N/A
+
+Servers
+-------
+
+N/A
+
+DNS Entries
+-----------
+
+N/A
+
+Documentation
+-------------
+
+N/A
+
+Security
+--------
+
+N/A
+
+Testing
+-------
+
+N/A
+
+Dependencies
+============
+
+N/A