diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -91,6 +91,9 @@ max_request_body_size = 107374182400
 ## (avoid memory leaks).
 #max-requests = 1000
 
+## enable large buffers
+#buffer-size=65535
+
 ## Log requests slower than the specified number of milliseconds.
 #log-slow = 10
 
diff --git a/production.ini b/production.ini
--- a/production.ini
+++ b/production.ini
@@ -91,6 +91,9 @@ max_request_body_size = 107374182400
 ## (avoid memory leaks).
 #max-requests = 1000
 
+## enable large buffers
+#buffer-size=65535
+
 ## Log requests slower than the specified number of milliseconds.
 #log-slow = 10
 
diff --git a/rhodecode/bin/template.ini.mako b/rhodecode/bin/template.ini.mako
--- a/rhodecode/bin/template.ini.mako
+++ b/rhodecode/bin/template.ini.mako
@@ -100,6 +100,9 @@ listen = 256
 <%text>## (avoid memory leaks).</%text>
 max-requests = 1000
 
+<%text>## enable large buffers</%text>
+buffer-size=65535
+
 <%text>## Log requests slower than the specified number of milliseconds.</%text>
 log-slow = 10
 
diff --git a/rhodecode/config/deployment.ini_tmpl b/rhodecode/config/deployment.ini_tmpl
--- a/rhodecode/config/deployment.ini_tmpl
+++ b/rhodecode/config/deployment.ini_tmpl
@@ -91,6 +91,9 @@ max_request_body_size = 107374182400
 ## (avoid memory leaks).
 #max-requests = 1000
 
+## enable large buffers
+#buffer-size=65535
+
 ## Log requests slower than the specified number of milliseconds.
 #log-slow = 10