diff --git a/README.rst b/README.rst
index 64bfc4cdc..4ecc50243 100644
--- a/README.rst
+++ b/README.rst
@@ -27,7 +27,7 @@ Use Cases
 Use
 ===
 
-This is split into roughly three steps:
+Installation and use of bifrost is split into roughly three steps:
 
 - **install**:
   prepare the local environment by downloading and/or building machine images,
@@ -41,7 +41,7 @@ This is split into roughly three steps:
 
 Supported operating systems:
 
-* Ubuntu 14.04, 14.10, 15.04
+* Ubuntu 14.04, 14.10, 15.04, 16.04
 * Red Hat Enterprise Linux (RHEL) 7
 * CentOS 7
 * Fedora 22
@@ -152,9 +152,13 @@ Then run::
 The second part is an Ansible playbook that installs and configures ironic
 in a stand-alone fashion.
 
-* Keystone is NOT installed, and ironic's API is accessible without
+* Keystone is NOT installed by default, and ironic's API is accessible without
   authentication.  It is possible to put basic password auth on ironic's API by
   changing the nginx configuration accordingly.
+
+  * Bifrost playbooks can leverage and optionally install keystone.
+    See :ref:`keystone`.
+
 * Neutron is NOT installed. Ironic performs static IP injection via
   config-drive.
 * dnsmasq is configured statically and responds to all PXE boot requests by
diff --git a/doc/source/deploy/keystone.rst b/doc/source/deploy/keystone.rst
index 48918beee..25f09bd6f 100644
--- a/doc/source/deploy/keystone.rst
+++ b/doc/source/deploy/keystone.rst
@@ -1,3 +1,5 @@
+.. _keystone:
+
 *********************
 Bifrost with Keystone
 *********************
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 1f74cb167..78bc35623 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -11,6 +11,7 @@ Contents:
    troubleshooting
    vagrant
    deploy/dhcp
+   deploy/keystone
    offline-install
 
 Indices and tables