diff --git a/doc/source/userdoc/advanced.configuration.guide.rst b/doc/source/userdoc/advanced.configuration.guide.rst
index fd6fcedf..3799509b 100644
--- a/doc/source/userdoc/advanced.configuration.guide.rst
+++ b/doc/source/userdoc/advanced.configuration.guide.rst
@@ -156,8 +156,8 @@ you want to run sahara services and follow these steps:
    configured to use the same message broker and database.
 
 To configure oslo.messaging, first you will need to choose a message
-broker driver. Currently there are three drivers provided: RabbitMQ, Qpid
-or ZeroMQ. For the RabbitMQ or Qpid drivers please see the
+broker driver. Currently there are two drivers provided: RabbitMQ
+or ZeroMQ. For the RabbitMQ drivers please see the
 :ref:`notification-configuration` documentation for an explanation of
 common configuration options.
 
@@ -167,20 +167,27 @@ respective source trees:
 
  * For Rabbit MQ see
 
-   * rabbit_opts variable in `impl_rabbit.py <https://git.openstack.org/cgit/openstack/oslo.messaging/tree/oslo/messaging/_drivers/impl_rabbit.py?id=1.4.0#n38>`_
-   * amqp_opts variable in `amqp.py <https://git.openstack.org/cgit/openstack/oslo.messaging/tree/oslo/messaging/_drivers/amqp.py?id=1.4.0#n37>`_
-
- * For Qpid see
-
-   * qpid_opts variable in `impl_qpid.py <https://git.openstack.org/cgit/openstack/oslo.messaging/tree/oslo/messaging/_drivers/impl_qpid.py?id=1.4.0#n40>`_
-   * amqp_opts variable in `amqp.py <https://git.openstack.org/cgit/openstack/oslo.messaging/tree/oslo/messaging/_drivers/amqp.py?id=1.4.0#n37>`_
+   * rabbit_opts variable in `impl_rabbit.py <https://git.openstack.org/
+     cgit/openstack/oslo.messaging/tree/oslo/messaging/_drivers
+     /impl_rabbit.py?id=1.4.0#n38>`_
+   * amqp_opts variable in `amqp.py <https://git.openstack.org/cgit/
+     openstack/oslo.messaging/tree/oslo/messaging/
+     _drivers/amqp.py?id=1.4.0#n37>`_
 
  * For Zmq see
 
-   * zmq_opts variable in `impl_zmq.py <https://git.openstack.org/cgit/openstack/oslo.messaging/tree/oslo/messaging/_drivers/impl_zmq.py?id=1.4.0#n49>`_
-   * matchmaker_opts variable in `matchmaker.py <https://git.openstack.org/cgit/openstack/oslo.messaging/tree/oslo/messaging/_drivers/matchmaker.py?id=1.4.0#n27>`_
-   * matchmaker_redis_opts variable in `matchmaker_redis.py <https://git.openstack.org/cgit/openstack/oslo.messaging/tree/oslo/messaging/_drivers/matchmaker_redis.py?id=1.4.0#n26>`_
-   * matchmaker_opts variable in `matchmaker_ring.py <https://git.openstack.org/cgit/openstack/oslo.messaging/tree/oslo/messaging/_drivers/matchmaker_ring.py?id=1.4.0#n27>`_
+   * zmq_opts variable in `impl_zmq.py <https://git.openstack.org/cgit/
+     openstack/oslo.messaging/tree/oslo/messaging/_drivers/
+     impl_zmq.py?id=1.4.0#n49>`_
+   * matchmaker_opts variable in `matchmaker.py <https://git.openstack.org/
+     cgit/openstack/oslo.messaging/tree/oslo/messaging/_drivers/
+     matchmaker.py?id=1.4.0#n27>`_
+   * matchmaker_redis_opts variable in `matchmaker_redis.py <https://
+     git.openstack.org/cgit/openstack/oslo.messaging/tree/oslo/messaging/
+     _drivers/matchmaker_redis.py?id=1.4.0#n26>`_
+   * matchmaker_opts variable in `matchmaker_ring.py <https://
+     git.openstack.org/cgit/openstack/oslo.messaging/tree/oslo/messaging/
+     _drivers/matchmaker_ring.py?id=1.4.0#n27>`_
 
 These options will also be present in the generated sample configuration
 file. For instructions on creating the configuration file please see the
diff --git a/doc/source/userdoc/configuration.guide.rst b/doc/source/userdoc/configuration.guide.rst
index 2d12368e..a8f816ba 100644
--- a/doc/source/userdoc/configuration.guide.rst
+++ b/doc/source/userdoc/configuration.guide.rst
@@ -144,8 +144,7 @@ should be set in the ``[DEFAULT]`` section of the configuration file:
     notification_driver = messaging
 ..
 
-By default sahara is configured to use RabbitMQ as its message broker,
-but it can be configured to use Qpid instead if needed.
+By default sahara is configured to use RabbitMQ as its message broker.
 
 If you are using RabbitMQ as the message broker, then you should set the
 following parameter in the ``[DEFAULT]`` section:
@@ -170,26 +169,6 @@ adjustment:
     rabbit_virtual_host=/
 ..
 
-If you are using Qpid as the message broker, then you should
-set the ``rpc_backend`` as follows:
-
-.. sourcecode:: cfg
-
-    rpc_backend = qpid
-..
-
-You may also need to adjust the following default connection parameters
-in the ``[oslo_messaging_qpid]`` section:
-
-.. sourcecode:: cfg
-
-    qpid_hostname=localhost
-    qpid_port=5672
-    qpid_hosts=$qpid_hostname:$qpid_port
-    qpid_username=
-    qpid_password=
-..
-
 .. _orchestration-configuration:
 
 Orchestration configuration