diff --git a/doc/config-ref-rst/source/database-service.rst b/doc/config-ref-rst/source/database-service.rst
index f0c73f8119..dd546515d0 100644
--- a/doc/config-ref-rst/source/database-service.rst
+++ b/doc/config-ref-rst/source/database-service.rst
@@ -4,4 +4,6 @@ Database service
 
 .. toctree::
 
+   database-service/databaseservice_db.rst
+   database-service/databaseservice_rpc.rst
    tables/conf-changes/trove.rst
diff --git a/doc/config-ref-rst/source/database-service/databaseservice_db.rst b/doc/config-ref-rst/source/database-service/databaseservice_db.rst
new file mode 100644
index 0000000000..ba14c30492
--- /dev/null
+++ b/doc/config-ref-rst/source/database-service/databaseservice_db.rst
@@ -0,0 +1,18 @@
+======================
+Configure the database
+======================
+
+Use the options to configure the used databases:
+
+.. include:: ../tables/trove-database.rst
+.. include:: ../tables/trove-db_cassandra.rst
+.. include:: ../tables/trove-db_couchbase.rst
+.. include:: ../tables/trove-db_db2.rst
+.. include:: ../tables/trove-db_mariadb.rst
+.. include:: ../tables/trove-db_mongodb.rst
+.. include:: ../tables/trove-db_mysql.rst
+.. include:: ../tables/trove-db_pxc.rst
+.. include:: ../tables/trove-db_percona.rst
+.. include:: ../tables/trove-db_postgresql.rst
+.. include:: ../tables/trove-db_redis.rst
+.. include:: ../tables/trove-db_vertica.rst
diff --git a/doc/config-ref-rst/source/database-service/databaseservice_rpc.rst b/doc/config-ref-rst/source/database-service/databaseservice_rpc.rst
new file mode 100644
index 0000000000..e8a739753b
--- /dev/null
+++ b/doc/config-ref-rst/source/database-service/databaseservice_rpc.rst
@@ -0,0 +1,38 @@
+==================================
+Configure the RPC messaging system
+==================================
+
+OpenStack projects use an open standard for messaging middleware known
+as AMQP. This messaging middleware enables the OpenStack services that
+run on multiple servers to talk to each other. OpenStack Trove RPC
+supports three implementations of AMQP: RabbitMQ, Qpid, and ZeroMQ.
+
+Configure RabbitMQ
+~~~~~~~~~~~~~~~~~~
+
+Use these options to configure the RabbitMQ messaging system:
+
+.. include:: ../tables/trove-rabbitmq.rst
+
+Configure Qpid
+~~~~~~~~~~~~~~
+
+Use these options to configure the Qpid messaging system:
+
+.. include:: ../tables/trove-qpid.rst
+
+Configure ZeroMQ
+~~~~~~~~~~~~~~~~
+
+Use these options to configure the ZeroMQ messaging system:
+
+.. include:: ../tables/trove-zeromq.rst
+
+Configure messaging
+~~~~~~~~~~~~~~~~~~~
+
+Use these common options to configure the RabbitMQ, Qpid, and ZeroMq
+messaging drivers:
+
+.. include:: ../tables/trove-amqp.rst
+.. include:: ../tables/trove-rpc.rst