diff --git a/doc/source/queens/schedule.rst b/doc/source/queens/schedule.rst
index be179dfcc9..1a6525720e 100644
--- a/doc/source/queens/schedule.rst
+++ b/doc/source/queens/schedule.rst
@@ -323,6 +323,39 @@ All Glance, python-glanceclient, and glance_store specs must be merged into
 the glance-specs repository by 23:59 on Friday 6 October 2017.  This is a
 necessary but not sufficient condition for inclusion in the Queens release.
 
+Keystone
+--------
+
+.. _q-keystone-spec-proposal-freeze:
+
+Keystone Spec Proposal Freeze
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+All Keystone specs targeted to Queens must be submitted to the keystone-specs
+repository by the end of the week.
+
+.. _q-keystone-spec-freeze:
+
+Keystone Spec Freeze
+^^^^^^^^^^^^^^^^^^^^
+
+All Keystone specs targeted to Queens must be approved by the end of the week.
+
+.. _q-keystone-fpfreeze:
+
+Keystone Feature Proposal Freeze
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+All new Keystone features must be proposed and substantially completed, with
+unit tests and documentation by the end of the week.
+
+.. _q-keystone-ffreeze:
+
+Keystone Feature Freeze
+^^^^^^^^^^^^^^^^^^^^^^^
+
+All new Keystone features must be merged by the end of the week.
+
 Cinder
 ------
 
diff --git a/doc/source/queens/schedule.yaml b/doc/source/queens/schedule.yaml
index 3d6ef0246b..e3d90c38b9 100644
--- a/doc/source/queens/schedule.yaml
+++ b/doc/source/queens/schedule.yaml
@@ -43,6 +43,7 @@ cycle:
   project-specific:
   - q-manila-spec-freeze
   - q-nova-spec-freeze
+  - q-keystone-spec-proposal-freeze
 - end: '2017-10-27'
   name: R-18
   start: '2017-10-23'
@@ -74,12 +75,15 @@ cycle:
   - q-cinder-driver-deadline
   - q-cinder-spec-freeze
   - q-sahara-plugin-deadline
+  - q-keystone-spec-freeze
 - end: '2017-12-15'
   name: R-11
   start: '2017-12-11'
 - end: '2017-12-22'
   name: R-10
   start: '2017-12-18'
+  project-specific:
+  - q-keystone-fpfreeze
 - end: '2017-12-29'
   name: R-9
   start: '2017-12-25'
@@ -110,6 +114,8 @@ cycle:
   - q-soft-sf
   - q-rf
   - q-goals-complete
+  project-specific:
+  - q-keystone-ffreeze
 - end: '2018-02-02'
   name: R-4
   start: '2018-01-29'