diff --git a/etc/neutron.conf b/etc/neutron.conf
index 1e2226fc3e..091a71ce06 100644
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -266,6 +266,9 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
 # Number of backlog requests to configure the socket with.
 # backlog = 4096
 
+# Max header line to accommodate large tokens
+# max_header_line = 16384
+
 # Enable SSL on the API server
 # use_ssl = False
 
diff --git a/neutron/wsgi.py b/neutron/wsgi.py
index 9d9ff7b90e..c667f71b1e 100644
--- a/neutron/wsgi.py
+++ b/neutron/wsgi.py
@@ -58,6 +58,9 @@ socket_opts = [
     cfg.IntOpt('retry_until_window',
                default=30,
                help=_("Number of seconds to keep retrying to listen")),
+    cfg.IntOpt('max_header_line',
+               default=16384,
+               help=_("Max header line to accommodate large tokens")),
     cfg.BoolOpt('use_ssl',
                 default=False,
                 help=_('Enable SSL on the API server')),
@@ -116,6 +119,8 @@ class Server(object):
     """Server class to manage multiple WSGI sockets and applications."""
 
     def __init__(self, name, threads=1000):
+        # Raise the default from 8192 to accommodate large tokens
+        eventlet.wsgi.MAX_HEADER_LINE = CONF.max_header_line
         self.pool = eventlet.GreenPool(threads)
         self.name = name
         self._launcher = None