diff --git a/manifests/config.pp b/manifests/config.pp
index 000afbeba..230a663ce 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -27,7 +27,10 @@
   $proxy_http_version     = $nginx::params::nx_proxy_http_version,
   $types_hash_max_size    = $nginx::params::nx_types_hash_max_size,
   $types_hash_bucket_size = $nginx::params::nx_types_hash_bucket_size,
-  $http_cfg_append        = $nginx::params::nx_http_cfg_append
+  $client_max_body_size   = $nginx::params::nx_client_max_body_size,
+  $proxy_buffers          = $nginx::params::nx_proxy_buffers,
+  $http_cfg_append        = $nginx::params::nx_http_cfg_append,
+  $proxy_buffer_size      = $nginx::params::nx_proxy_buffer_size,
 ) inherits nginx::params {
   File {
     owner => 'root',
diff --git a/manifests/init.pp b/manifests/init.pp
index 7cbaa0e8c..63d93f8c1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -44,6 +44,9 @@
   $service_restart        = $nginx::params::nx_service_restart,
   $mail                   = $nginx::params::nx_mail,
   $server_tokens          = $nginx::params::nx_server_tokens,
+  $client_max_body_size   = $nginx::params::nx_client_max_body_size,
+  $proxy_buffers          = $nginx::params::nx_proxy_buffers,
+  $proxy_buffer_size      = $nginx::params::nx_proxy_buffer_size,
   $http_cfg_append        = $nginx::params::nx_http_cfg_append,
   $nginx_vhosts           = {},
   $nginx_upstreams        = {},
@@ -68,6 +71,9 @@
     proxy_cache_inactive  => $proxy_cache_inactive,
     confd_purge           => $confd_purge,
     server_tokens         => $server_tokens,
+    client_max_body_size  => $client_max_body_size,
+    proxy_buffers         => $proxy_buffers,
+    proxy_buffer_size     => $proxy_buffer_size,
     http_cfg_append       => $http_cfg_append,
     require               => Class['nginx::package'],
     notify                => Class['nginx::service'],
diff --git a/manifests/params.pp b/manifests/params.pp
index 2b19b3b71..a38abdbb9 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -58,6 +58,7 @@
   $nx_proxy_read_timeout      = '90'
   $nx_proxy_buffers           = '32 4k'
   $nx_proxy_http_version      = '1.0'
+  $nx_proxy_buffer_size       = '8k'
 
   $nx_logdir = $::kernel ? {
     /(?i-mx:linux)/ => '/var/log/nginx',
diff --git a/templates/conf.d/proxy.conf.erb b/templates/conf.d/proxy.conf.erb
index 8225879c5..fcd7e1d5b 100644
--- a/templates/conf.d/proxy.conf.erb
+++ b/templates/conf.d/proxy.conf.erb
@@ -1,10 +1,11 @@
 proxy_redirect          <%= scope.lookupvar('nginx::params::nx_proxy_redirect') %>;
-client_max_body_size    <%= scope.lookupvar('nginx::params::nx_client_max_body_size') %>;
+client_max_body_size      <%= @client_max_body_size %>;
 client_body_buffer_size <%= scope.lookupvar('nginx::params::nx_client_body_buffer_size') %>;
 proxy_connect_timeout   <%= scope.lookupvar('nginx::params::nx_proxy_connect_timeout') %>;
 proxy_send_timeout      <%= scope.lookupvar('nginx::params::nx_proxy_send_timeout') %>;
 proxy_read_timeout      <%= scope.lookupvar('nginx::params::nx_proxy_read_timeout') %>;
-proxy_buffers           <%= scope.lookupvar('nginx::params::nx_proxy_buffers') %>;
+proxy_buffers           <%= @proxy_buffers %>;
+proxy_buffer_size       <%= @proxy_buffer_size %>;
 proxy_http_version      <%= @proxy_http_version %>;
 <% @proxy_set_header.each do |header| %>
 proxy_set_header        <%= header %>;<% end %>