diff --git a/doc/source/index.rst b/doc/source/index.rst
index c4117d8..5427e05 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -14,6 +14,7 @@ on for the upcoming release. This is the output of those discussions:
    :glob:
    :maxdepth: 1
 
+   priorities/ocata-priorities
    priorities/newton-priorities
 
 Specifications
@@ -25,6 +26,7 @@ Here you can find the specs, and spec template, for each release:
    :glob:
    :maxdepth: 1
 
+   specs/ocata/index
    specs/newton/index
 
 There are also some approved backlog specifications that are looking for owners:
diff --git a/doc/source/specs/ocata/approved b/doc/source/specs/ocata/approved
new file mode 120000
index 0000000..ee8d997
--- /dev/null
+++ b/doc/source/specs/ocata/approved
@@ -0,0 +1 @@
+../../../../specs/ocata/approved
\ No newline at end of file
diff --git a/doc/source/specs/ocata/backlog b/doc/source/specs/ocata/backlog
new file mode 120000
index 0000000..7f0c458
--- /dev/null
+++ b/doc/source/specs/ocata/backlog
@@ -0,0 +1 @@
+../../../../specs/ocata/backlog
\ No newline at end of file
diff --git a/doc/source/specs/ocata/implemented b/doc/source/specs/ocata/implemented
new file mode 120000
index 0000000..0fdc911
--- /dev/null
+++ b/doc/source/specs/ocata/implemented
@@ -0,0 +1 @@
+../../../../specs/ocata/implemented
\ No newline at end of file
diff --git a/doc/source/specs/ocata/index.rst b/doc/source/specs/ocata/index.rst
new file mode 100644
index 0000000..e51b855
--- /dev/null
+++ b/doc/source/specs/ocata/index.rst
@@ -0,0 +1,34 @@
+===========================
+Charm Ocata Specifications
+===========================
+
+Template:
+
+.. toctree::
+   :maxdepth: 1
+
+   Specification Template (Ocata release) <template>
+
+Ocata implemented specs:
+
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+   implemented/*
+
+Ocata approved (but not implemented) specs:
+
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+   approved/*
+
+Ocata backlog (carried over from previous cycle) specs:
+
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+   backlog/*
diff --git a/doc/source/specs/ocata/redirects b/doc/source/specs/ocata/redirects
new file mode 120000
index 0000000..c27b1db
--- /dev/null
+++ b/doc/source/specs/ocata/redirects
@@ -0,0 +1 @@
+../../../../specs/ocata/redirects
\ No newline at end of file
diff --git a/doc/source/specs/ocata/template.rst b/doc/source/specs/ocata/template.rst
new file mode 120000
index 0000000..143fd01
--- /dev/null
+++ b/doc/source/specs/ocata/template.rst
@@ -0,0 +1 @@
+../../../../specs/template.rst
\ No newline at end of file
diff --git a/specs/newton/approved/aodh.rst b/specs/newton/implemented/aodh.rst
similarity index 100%
rename from specs/newton/approved/aodh.rst
rename to specs/newton/implemented/aodh.rst
diff --git a/specs/newton/approved/barbican.rst b/specs/newton/implemented/barbican.rst
similarity index 100%
rename from specs/newton/approved/barbican.rst
rename to specs/newton/implemented/barbican.rst
diff --git a/specs/newton/approved/ceph-autotune.rst b/specs/newton/implemented/ceph-autotune.rst
similarity index 100%
rename from specs/newton/approved/ceph-autotune.rst
rename to specs/newton/implemented/ceph-autotune.rst
diff --git a/specs/newton/approved/designate.rst b/specs/newton/implemented/designate.rst
similarity index 100%
rename from specs/newton/approved/designate.rst
rename to specs/newton/implemented/designate.rst
diff --git a/specs/newton/approved/external-networking-redux.rst b/specs/newton/implemented/external-networking-redux.rst
similarity index 100%
rename from specs/newton/approved/external-networking-redux.rst
rename to specs/newton/implemented/external-networking-redux.rst
diff --git a/specs/newton/approved/sriov-support.rst b/specs/newton/implemented/sriov-support.rst
similarity index 100%
rename from specs/newton/approved/sriov-support.rst
rename to specs/newton/implemented/sriov-support.rst
diff --git a/specs/newton/approved/ceph-broker.rst b/specs/ocata/approved/ceph-broker.rst
similarity index 100%
rename from specs/newton/approved/ceph-broker.rst
rename to specs/ocata/approved/ceph-broker.rst
diff --git a/specs/newton/approved/cephfs.rst b/specs/ocata/approved/cephfs.rst
similarity index 100%
rename from specs/newton/approved/cephfs.rst
rename to specs/ocata/approved/cephfs.rst
diff --git a/specs/newton/approved/mistral.rst b/specs/ocata/approved/mistral.rst
similarity index 100%
rename from specs/newton/approved/mistral.rst
rename to specs/ocata/approved/mistral.rst
diff --git a/specs/newton/approved/murano.rst b/specs/ocata/approved/murano.rst
similarity index 100%
rename from specs/newton/approved/murano.rst
rename to specs/ocata/approved/murano.rst
diff --git a/specs/newton/approved/trove.rst b/specs/ocata/approved/trove.rst
similarity index 100%
rename from specs/newton/approved/trove.rst
rename to specs/ocata/approved/trove.rst
diff --git a/specs/newton/approved/charm-layering.rst b/specs/ocata/backlog/charm-layering.rst
similarity index 100%
rename from specs/newton/approved/charm-layering.rst
rename to specs/ocata/backlog/charm-layering.rst
diff --git a/specs/newton/approved/keystone-federation.rst b/specs/ocata/backlog/keystone-federation.rst
similarity index 100%
rename from specs/newton/approved/keystone-federation.rst
rename to specs/ocata/backlog/keystone-federation.rst
diff --git a/specs/ocata/redirects b/specs/ocata/redirects
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_directories.py b/tests/test_directories.py
index 131b49b..1cf84c4 100644
--- a/tests/test_directories.py
+++ b/tests/test_directories.py
@@ -22,7 +22,7 @@ class TestDirectories(testtools.TestCase):
         releases = [x.split('/')[1] for x in glob.glob('specs/*/')]
         for release in releases:
             files = os.listdir("specs/%s/" % release)
-            valid = ['redirects', 'implemented', 'approved']
+            valid = ['redirects', 'implemented', 'approved', 'backlog']
             for name in files:
                 if name.startswith('.'):
                     continue