diff --git a/config/galaxy.yml.sample b/config/galaxy.yml.sample
index f44908f9c22..a18fe1afa5b 100644
--- a/config/galaxy.yml.sample
+++ b/config/galaxy.yml.sample
@@ -23,6 +23,12 @@ uwsgi:
   # ':8080' to listen on all available network interfaces.
   http: 127.0.0.1:8080
 
+  # By default uWSGI allocates a very small buffer (4096 bytes) for the
+  # headers of each request. If you start receiving "invalid request
+  # block size" in your logs, it could mean you need a bigger buffer.
+  # Increase it up to 65535.
+  buffer-size: 4096
+
   # Number of web server (worker) processes to fork after the
   # application has loaded.
   processes: 1
diff --git a/config/reports.yml.sample b/config/reports.yml.sample
index 438d9b14b46..9139904172f 100644
--- a/config/reports.yml.sample
+++ b/config/reports.yml.sample
@@ -5,6 +5,12 @@ uwsgi:
   # ':9001' to listen on all available network interfaces.
   http: 127.0.0.1:9001
 
+  # By default uWSGI allocates a very small buffer (4096 bytes) for the
+  # headers of each request. If you start receiving "invalid request
+  # block size" in your logs, it could mean you need a bigger buffer.
+  # Increase it up to 65535.
+  buffer-size: 4096
+
   # Number of web server (worker) processes to fork after the
   # application has loaded.
   processes: 1
diff --git a/config/tool_shed.yml.sample b/config/tool_shed.yml.sample
index 824f1134279..b7d125f9a9d 100644
--- a/config/tool_shed.yml.sample
+++ b/config/tool_shed.yml.sample
@@ -5,6 +5,12 @@ uwsgi:
   # ':9009' to listen on all available network interfaces.
   http: 127.0.0.1:9009
 
+  # By default uWSGI allocates a very small buffer (4096 bytes) for the
+  # headers of each request. If you start receiving "invalid request
+  # block size" in your logs, it could mean you need a bigger buffer.
+  # Increase it up to 65535.
+  buffer-size: 4096
+
   # Number of web server (worker) processes to fork after the
   # application has loaded.
   processes: 1
diff --git a/lib/galaxy/webapps/config_manage.py b/lib/galaxy/webapps/config_manage.py
index 714d4628544..1a9d600fe2f 100644
--- a/lib/galaxy/webapps/config_manage.py
+++ b/lib/galaxy/webapps/config_manage.py
@@ -54,6 +54,11 @@ UWSGI_OPTIONS = OrderedDict([
         'default': '127.0.0.1:$default_port',
         'type': 'str',
     }),
+    ('buffer-size', {
+        'desc': """By default uWSGI allocates a very small buffer (4096 bytes) for the headers of each request. If you start receiving "invalid request block size" in your logs, it could mean you need a bigger buffer. Increase it up to 65535.""",
+        'default': '4096',
+        'type': 'int',
+    }),
     ('processes', {
         'desc': """Number of web server (worker) processes to fork after the application has loaded.""",
         'default': '1',