diff --git a/doc/source/index.rst b/doc/source/index.rst
index 03060c0e..f2a0eb89 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -4,6 +4,22 @@
 Image Service (Glance) Plans
 ============================
 
+The Glance Project Team has the responsibility for maintaining the
+following projects:
+
+* Glance: https://git.openstack.org/cgit/openstack/glance
+* The glance_store library: https://git.openstack.org/cgit/openstack/glance_store
+* The Glance client: https://git.openstack.org/cgit/openstack/python-glanceclient
+
+This repository contains proposals for new features, or proposals for
+changes to the current projects that are sufficiently complicated or
+controversial that in-depth discussion is required.
+
+Please see the `Glance Contribution Guidelines`_ for information about how to
+make a proposal to this repository.
+
+.. _Glance Contribution Guidelines: https://docs.openstack.org/developer/glance/contributing/blueprints.html
+
 Priorities
 ==========
 
@@ -20,12 +36,11 @@ discussions:
 Specifications
 ==============
 
-Glance specs:
-
 .. toctree::
    :glob:
    :maxdepth: 1
 
+   specs/untargeted/*
    specs/juno/index
    specs/kilo/index
    specs/liberty/index
@@ -35,16 +50,6 @@ Glance specs:
    specs/pike/*
    specs/queens/*
 
-Client specs:
-
-.. toctree::
-   :glob:
-   :maxdepth: 1
-
-   specs/glanceclient/*
-
-
-
 ====================
 Image service V2 API
 ====================
diff --git a/specs/liberty/healtcheck-middleware.rst b/specs/liberty/approved/healtcheck-middleware.rst
similarity index 100%
rename from specs/liberty/healtcheck-middleware.rst
rename to specs/liberty/approved/healtcheck-middleware.rst
diff --git a/specs/liberty/http-proxy-support-for-s3.rst b/specs/liberty/approved/http-proxy-support-for-s3.rst
similarity index 100%
rename from specs/liberty/http-proxy-support-for-s3.rst
rename to specs/liberty/approved/http-proxy-support-for-s3.rst
diff --git a/specs/liberty/image-signing-and-verification-support.rst b/specs/liberty/approved/image-signing-and-verification-support.rst
similarity index 100%
rename from specs/liberty/image-signing-and-verification-support.rst
rename to specs/liberty/approved/image-signing-and-verification-support.rst
diff --git a/specs/liberty/metadefs-tags-cli.rst b/specs/liberty/approved/metadefs-tags-cli.rst
similarity index 100%
rename from specs/liberty/metadefs-tags-cli.rst
rename to specs/liberty/approved/metadefs-tags-cli.rst
diff --git a/specs/liberty/migrate-replicator-to-requests.rst b/specs/liberty/approved/migrate-replicator-to-requests.rst
similarity index 100%
rename from specs/liberty/migrate-replicator-to-requests.rst
rename to specs/liberty/approved/migrate-replicator-to-requests.rst
diff --git a/specs/liberty/remove-special-client-ssl-handling.rst b/specs/liberty/approved/remove-special-client-ssl-handling.rst
similarity index 100%
rename from specs/liberty/remove-special-client-ssl-handling.rst
rename to specs/liberty/approved/remove-special-client-ssl-handling.rst
diff --git a/specs/liberty/reuse-the-deleted-image-member-before-create.rst b/specs/liberty/approved/reuse-the-deleted-image-member-before-create.rst
similarity index 100%
rename from specs/liberty/reuse-the-deleted-image-member-before-create.rst
rename to specs/liberty/approved/reuse-the-deleted-image-member-before-create.rst
diff --git a/specs/liberty/scrub-images-in-parallel.rst b/specs/liberty/approved/scrub-images-in-parallel.rst
similarity index 100%
rename from specs/liberty/scrub-images-in-parallel.rst
rename to specs/liberty/approved/scrub-images-in-parallel.rst
diff --git a/specs/liberty/v2-additional-filtering.rst b/specs/liberty/approved/v2-additional-filtering.rst
similarity index 100%
rename from specs/liberty/v2-additional-filtering.rst
rename to specs/liberty/approved/v2-additional-filtering.rst
diff --git a/specs/glanceclient/session-objects.rst b/specs/liberty/glanceclient/session-objects.rst
similarity index 100%
rename from specs/glanceclient/session-objects.rst
rename to specs/liberty/glanceclient/session-objects.rst
diff --git a/specs/liberty/index.rst b/specs/liberty/index.rst
index fb3cf841..6a807dd8 100644
--- a/specs/liberty/index.rst
+++ b/specs/liberty/index.rst
@@ -2,9 +2,18 @@
  Liberty Specifications
 =======================
 
+Glance specs:
+
 .. toctree::
    :glob:
-   :maxdepth: 2
+   :maxdepth: 1
 
-   *
+   approved/*
 
+Glanceclient specs:
+
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+   glanceclient/*
diff --git a/specs/untargeted/index.rst b/specs/untargeted/index.rst
new file mode 100644
index 00000000..53c5b57f
--- /dev/null
+++ b/specs/untargeted/index.rst
@@ -0,0 +1,43 @@
+=================================
+Utargeted Approved Specifications
+=================================
+
+The following specs have been reviewed and approved but have
+not been targeted for a release because the proposer is no longer
+available to work on the implementation.
+
+If you are interested in picking one of these up, please put an
+item on the agenda for the next convenient `Glance meeting`_ so
+that we can quickly discuss whether the spec is still relevant and
+also so that the Glance community is aware that you'd like to work
+on implementing one of these specs.
+
+.. _Glance meeting: https://etherpad.openstack.org/p/glance-team-meeting-agenda
+
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+.. Approved untargeted specs for Glance:
+
+.. .. toctree::
+..    :glob:
+..    :maxdepth: 1
+
+..    glance/*
+
+.. Approved untargeted specs for glance_store:
+
+.. .. toctree::
+..    :glob:
+..    :maxdepth: 1
+
+..    glance_store/*
+
+.. Approved untargeted specs for python-glanceclient:
+
+.. .. toctree::
+..    :glob:
+..    :maxdepth: 1
+
+..    python-glanceclient/*