diff --git a/doc/common/section_rpc-for-networking.xml b/doc/common/section_rpc-for-networking.xml
index ba0ff97cfd..772f89ee44 100644
--- a/doc/common/section_rpc-for-networking.xml
+++ b/doc/common/section_rpc-for-networking.xml
@@ -117,6 +117,8 @@ qpid_protocol=ssl
         <application>ZeroMq</application> messaging drivers:</para>
 
     <xi:include href="tables/neutron-rpc.xml"/>
+    <xi:include href="tables/neutron-amqp.xml"/>
     <xi:include href="tables/neutron-notifier.xml"/>
+    <xi:include href="tables/neutron-redis.xml"/>
   </section>
 </section>
diff --git a/doc/common/tables/neutron-ofa_agent.xml b/doc/common/tables/neutron-ml2_ofa.xml
similarity index 100%
rename from doc/common/tables/neutron-ofa_agent.xml
rename to doc/common/tables/neutron-ml2_ofa.xml
diff --git a/doc/config-reference/networking/section_networking-options-reference.xml b/doc/config-reference/networking/section_networking-options-reference.xml
index 966793f146..3fcf279df1 100644
--- a/doc/config-reference/networking/section_networking-options-reference.xml
+++ b/doc/config-reference/networking/section_networking-options-reference.xml
@@ -27,6 +27,12 @@
 <xi:include href="../../common/tables/neutron-api.xml"/>
 </section>
 
+<section xml:id="networking-options-compute">
+<title>Compute</title>
+<para>Use the following options to alter Compute-related settings.</para>
+<xi:include href="../../common/tables/neutron-compute.xml"/>
+</section>
+
 <section xml:id="networking-options-db">
 <title>Database</title>
 <para>Use the following options to alter Database-related settings.</para>
@@ -39,6 +45,20 @@
 <xi:include href="../../common/tables/neutron-dhcp_agent.xml"/>
 </section>
 
+<section xml:id="networking-options-embrane_lb">
+<title>Embrane LBaaS driver</title>
+<para>Use the following options to alter Embrane
+Loadbalancer-as-a-Service related settings.</para>
+<xi:include href="../../common/tables/neutron-embrane_lb.xml"/>
+</section>
+
+<section xml:id="networking-options-fwaas">
+<title>Firewall-as-a-Service driver</title>
+<para>Use the following options in the <filename>fwaas_driver.ini</filename>
+    file for the FwaaS driver.</para>
+<xi:include href="../../common/tables/neutron-fwaas.xml"/>
+</section>
+
 <section xml:id="networking-options-l3_agent">
 <title>L3 agent</title>
 <para>Use the following options in the <filename>l3_agent.ini</filename>
@@ -46,6 +66,13 @@
 <xi:include href="../../common/tables/neutron-l3_agent.xml"/>
 </section>
 
+<section xml:id="networking-options-lbaas">
+<title>Loadbalancer-as-a-Service agent</title>
+<para>Use the following options in the <filename>lbaas_agent.ini</filename>
+    file for the LbaaS agent.</para>
+<xi:include href="../../common/tables/neutron-lbaas.xml"/>
+</section>
+
 <section xml:id="networking-options-logging">
 <title>Logging</title>
 <para>Use the following options to alter logging settings.</para>
@@ -114,6 +141,20 @@ for your driver to change security group settings.</para>
     <xi:include href="../../common/tables/neutron-testing.xml"/>
 </section>
 
+<section xml:id="networking-options-varmour">
+<title>vArmour Firewall-as-a-Service driver</title>
+<para>Use the following options in the <filename>l3_agent.ini</filename>
+    file for the vArmour FwaaS driver.</para>
+<xi:include href="../../common/tables/neutron-varmour.xml"/>
+</section>
+
+<section xml:id="networking-options-vpn">
+<title>VPN</title>
+<para>Use the following options in the <filename>vpn_agent.ini</filename>
+    file for the VPN agent.</para>
+    <xi:include href="../../common/tables/neutron-vpn.xml"/>
+</section>
+
 <section xml:id="networking-options-wsgi">
 <title>WSGI</title>
 <para>Use the following options in the
diff --git a/doc/config-reference/networking/section_networking-plugins-ml2.xml b/doc/config-reference/networking/section_networking-plugins-ml2.xml
index 5b5b64cee2..ba7bb0e653 100644
--- a/doc/config-reference/networking/section_networking-plugins-ml2.xml
+++ b/doc/config-reference/networking/section_networking-plugins-ml2.xml
@@ -49,6 +49,16 @@
             options</title>
         <xi:include href="../../common/tables/neutron-ml2_flat.xml"/>
     </section>
+    <section xml:id="networking-plugin-ml2_gre">
+        <title>Modular Layer 2 (ml2) GRE Type configuration
+            options</title>
+        <xi:include href="../../common/tables/neutron-ml2_gre.xml"/>
+    </section>
+    <section xml:id="networking-plugin-ml2_vlan">
+        <title>Modular Layer 2 (ml2) VLAN Type configuration
+            options</title>
+        <xi:include href="../../common/tables/neutron-ml2_vlan.xml"/>
+    </section>
     <section xml:id="networking-plugin-ml2_vxlan">
         <title>Modular Layer 2 (ml2) VXLAN Type configuration
             options</title>
@@ -85,6 +95,11 @@
             options</title>
         <xi:include href="../../common/tables/neutron-ml2_odl.xml"/>
     </section>
+    <section xml:id="networking-plugin-ml2_ofa">
+        <title>Modular Layer 2 (ml2) OpenFlow Mechanism configuration
+            options</title>
+        <xi:include href="../../common/tables/neutron-ml2_ofa.xml"/>
+    </section>
     <section xml:id="networking-plugin-ml2_l2pop">
         <title>Modular Layer 2 (ml2) L2 Population Mechanism
             configuration options</title>
diff --git a/doc/config-reference/networking/section_networking-plugins.xml b/doc/config-reference/networking/section_networking-plugins.xml
index 9198d20e23..58181a5da2 100644
--- a/doc/config-reference/networking/section_networking-plugins.xml
+++ b/doc/config-reference/networking/section_networking-plugins.xml
@@ -43,6 +43,13 @@
                            href="../../common/tables/neutron-hyperv_agent.xml"
                   />
          </section>
+         <section xml:id="networking-plugin-embrane">
+                  <title>Embrane configuration
+                           options</title>
+                  <xi:include
+                           href="../../common/tables/neutron-embrane.xml"
+                  />
+         </section>
          <section xml:id="networking-plugin-sdnve">
                   <title>IBM SDN-VE configuration options</title>
                   <xi:include
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index f73ec5e58f..6e396f6cd9 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -116,9 +116,9 @@ nsx_controllers vmware
 nsx_password vmware
 nsx_user vmware
 num_sync_threads dhcp_agent
-ofp_listen_host ofa_agent
-ofp_ssl_listen_port ofa_agent
-ofp_tcp_listen_port ofa_agent
+ofp_listen_host ml2_ofa
+ofp_ssl_listen_port ml2_ofa
+ofp_tcp_listen_port ml2_ofa
 ovs_integration_bridge openvswitch_agent
 ovs_use_veth openvswitch_agent
 ovs_vsctl_timeout openvswitch_agent
@@ -190,7 +190,7 @@ use_stderr logging
 use_syslog logging
 verbose logging
 AGENT/enable_metrics_collection hyperv_agent
-AGENT/get_datapath_retry_times ofa_agent
+AGENT/get_datapath_retry_times ml2_ofa
 AGENT/integration_bridge nvsd
 AGENT/l2_population openvswitch_agent
 AGENT/local_network_vswitch hyperv_agent