diff --git a/neutron/conf/service.py b/neutron/conf/service.py
index 6c8626d7601..d68e0229b5f 100644
--- a/neutron/conf/service.py
+++ b/neutron/conf/service.py
@@ -39,6 +39,9 @@ service_opts = [
                help=_('Range of seconds to randomly delay when starting the '
                       'periodic task scheduler to reduce stampeding. '
                       '(Disable by setting to 0)')),
+    cfg.IntOpt('rpc_response_max_timeout',
+               default=600,
+               help=_('Maximum seconds to wait for a response from a call.')),
 ]
 
 
diff --git a/releasenotes/notes/add-rpc_response_max_timeout-option-cfaad5ef6af31632.yaml b/releasenotes/notes/add-rpc_response_max_timeout-option-cfaad5ef6af31632.yaml
new file mode 100644
index 00000000000..a3aeccbc170
--- /dev/null
+++ b/releasenotes/notes/add-rpc_response_max_timeout-option-cfaad5ef6af31632.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - Add config option ``rpc_response_max_timeout``
+    to configure the maximum time waiting for an
+    RPC response.