diff --git a/doc/install-guide/source/environment-dependencies.rst b/doc/install-guide/source/environment-dependencies.rst
index 2904e19860..017419e825 100644
--- a/doc/install-guide/source/environment-dependencies.rst
+++ b/doc/install-guide/source/environment-dependencies.rst
@@ -219,6 +219,32 @@ Finalize the installation
 
 |
 
+Install the OpenStack client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Throughout the guide the OpenStack client will be used to perform actions on
+the installed services.
+
+* Install the package:
+
+.. only:: debian or ubuntu
+
+   .. code-block:: console
+
+      # apt-get install python-openstackclient
+
+.. only:: rdo
+
+   .. code-block:: console
+
+      # yum install python-openstackclient
+
+.. only:: obs
+
+   .. code-block:: console
+
+      # zypper install python-openstackclient
+
 SQL database
 ~~~~~~~~~~~~
 
diff --git a/doc/install-guide/source/keystone-install.rst b/doc/install-guide/source/keystone-install.rst
index b3ae929a81..d200a09de4 100644
--- a/doc/install-guide/source/keystone-install.rst
+++ b/doc/install-guide/source/keystone-install.rst
@@ -78,7 +78,7 @@ database and an administration token.
 
             .. code-block:: console
 
-               # apt-get install keystone python-openstackclient apache2 libapache2-mod-wsgi \
+               # apt-get install keystone apache2 libapache2-mod-wsgi \
                  memcached python-memcache
 
    .. only:: obs or rdo
@@ -89,14 +89,14 @@ database and an administration token.
 
             .. code-block:: console
 
-               # yum install openstack-keystone httpd mod_wsgi python-openstackclient \
+               # yum install openstack-keystone httpd mod_wsgi \
                  memcached python-memcached
 
          .. only:: obs
 
             .. code-block:: console
 
-               # zypper install openstack-keystone python-openstackclient apache2-mod_wsgi \
+               # zypper install openstack-keystone apache2-mod_wsgi \
                  memcached python-python-memcached
 
    .. only:: obs or rdo