diff --git a/doc/config-reference/source/networking/networking_options_reference.rst b/doc/config-reference/source/networking/networking_options_reference.rst
index 3e215229de..bd78e75e5a 100644
--- a/doc/config-reference/source/networking/networking_options_reference.rst
+++ b/doc/config-reference/source/networking/networking_options_reference.rst
@@ -44,6 +44,11 @@ Linux bridge Agent configuration options
 
 .. include:: ../tables/neutron-linuxbridge_agent.rst
 
+MacVTap Agent configuration options
+----------------------------------------
+
+.. include:: ../tables/neutron-macvtap_agent.rst
+
 NEC configuration options
 -------------------------
 
diff --git a/doc/config-reference/source/tables/neutron-linuxbridge_agent.rst b/doc/config-reference/source/tables/neutron-linuxbridge_agent.rst
index e7e2e81b6a..fd0181e859 100644
--- a/doc/config-reference/source/tables/neutron-linuxbridge_agent.rst
+++ b/doc/config-reference/source/tables/neutron-linuxbridge_agent.rst
@@ -42,7 +42,3 @@
      - (Integer) TTL for vxlan interface protocol packets.
    * - ``vxlan_group`` = ``224.0.0.1``
      - (String) Multicast group(s) for vxlan interface. A range of group addresses may be specified by using CIDR notation. Specifying a range allows different VNIs to use different group addresses, reducing or eliminating spurious broadcast traffic to the tunnel endpoints. To reserve a unique group for each possible (24-bit) VNI, use a /8 such as 239.0.0.0/8. This setting must be the same on all the agents.
-   * - **[macvtap]**
-     -
-   * - ``physical_interface_mappings`` =
-     - (List) Comma-separated list of <physical_network>:<physical_interface> tuples mapping physical network names to the agent's node-specific physical network interfaces to be used for flat and VLAN networks. All physical networks listed in network_vlan_ranges on the server should have mappings to appropriate interfaces on each agent.
diff --git a/doc/config-reference/source/tables/neutron-macvtap_agent.rst b/doc/config-reference/source/tables/neutron-macvtap_agent.rst
new file mode 100644
index 0000000000..8809926d93
--- /dev/null
+++ b/doc/config-reference/source/tables/neutron-macvtap_agent.rst
@@ -0,0 +1,26 @@
+..
+    Warning: Do not edit this file. It is automatically generated from the
+    software project's code and your changes will be overwritten.
+
+    The tool to generate this file lives in openstack-doc-tools repository.
+
+    Please make any changes needed in the code, then run the
+    autogenerate-config-doc tool from the openstack-doc-tools repository, or
+    ask for help on the documentation mailing list, IRC channel or meeting.
+
+.. _neutron-macvtap_agent:
+
+.. list-table:: Description of MacVTap agent configuration options
+   :header-rows: 1
+   :class: config-ref-table
+
+   * - Configuration option = Default value
+     - Description
+   * - **[AGENT]**
+     -
+   * - ``quitting_rpc_timeout`` = ``10``
+     - (Integer) Set new timeout in seconds for new rpc calls after agent receives SIGTERM. If value is set to 0, rpc timeout won't be changed
+   * - **[macvtap]**
+     -
+   * - ``physical_interface_mappings`` =
+     - (List) Comma-separated list of <physical_network>:<physical_interface> tuples mapping physical network names to the agent's node-specific physical network interfaces to be used for flat and VLAN networks. All physical networks listed in network_vlan_ranges on the server should have mappings to appropriate interfaces on each agent.
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index c371f04d8b..a0ea49b5e3 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -190,7 +190,7 @@ AGENT/minimize_polling openvswitch_agent
 AGENT/ovsdb_monitor_respawn_interval openvswitch_agent
 AGENT/polling_interval hyperv_agent
 AGENT/prevent_arp_spoofing openvswitch_agent
-AGENT/quitting_rpc_timeout openvswitch_agent linuxbridge_agent
+AGENT/quitting_rpc_timeout openvswitch_agent linuxbridge_agent macvtap_agent
 AGENT/report_interval metering_agent
 AGENT/root_helper common
 AGENT/root_helper_daemon common
@@ -350,7 +350,7 @@ keystone_authtoken/revocation_cache_time auth_token
 keystone_authtoken/signing_dir auth_token
 keystone_authtoken/token_cache_time auth_token
 l2pop/agent_boot_time ml2_l2pop
-macvtap/physical_interface_mappings linuxbridge_agent
+macvtap/physical_interface_mappings macvtap_agent
 matchmaker_redis/check_timeout redis
 matchmaker_redis/host redis
 matchmaker_redis/password redis
diff --git a/tools/autogenerate-config-flagmappings/neutron.headers b/tools/autogenerate-config-flagmappings/neutron.headers
index 7d3a08e2c2..ace13278a7 100644
--- a/tools/autogenerate-config-flagmappings/neutron.headers
+++ b/tools/autogenerate-config-flagmappings/neutron.headers
@@ -28,6 +28,7 @@ lbaas_agent LBaaS agent
 lbaas_services LBaaS Embrane, Radware, NetScaler, HAproxy, Octavia plugin
 octavia Octavia
 linuxbridge_agent Linux Bridge agent
+macvtap_agent MacVTap agent
 metering_agent metering agent
 midonet Midonet
 ml2 ML2