diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2560bc813..7e1881a79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
   - Chef environments support (for Chef 0.10) [GH-358]
   - Suppress the "added to known hosts" message for SSH [GH-354]
   - Ruby 1.8.6 support [GH-352]
+  - Chef proxy settings now work for chef server [GH-335]
 
 ## 0.7.3 (April 19, 2011)
 
diff --git a/templates/chef_server_client.erb b/templates/chef_server_client.erb
index 5aadb7ceb..5d146f297 100644
--- a/templates/chef_server_client.erb
+++ b/templates/chef_server_client.erb
@@ -10,13 +10,21 @@ validation_client_name "<%= validation_client_name %>"
 validation_key         "<%= validation_key %>"
 client_key             "<%= client_key %>"
 
-file_cache_path    "<%= file_cache_path %>"
-file_backup_path   "<%= file_backup_path %>"
-
 <% unless environment.nil? %>
 environment        "<%= environment %>"
 <% end %>
 
+file_cache_path    "<%= file_cache_path %>"
+file_backup_path   "<%= file_backup_path %>"
+
+http_proxy <%= http_proxy.inspect %>
+http_proxy_user <%= http_proxy_user.inspect %>
+http_proxy_pass <%= http_proxy_pass.inspect %>
+https_proxy <%= https_proxy.inspect %>
+https_proxy_user <%= https_proxy_user.inspect %>
+https_proxy_pass <%= https_proxy_pass.inspect %>
+no_proxy <%= no_proxy.inspect %>
+
 pid_file           "/var/run/chef/chef-client.pid"
 
 Mixlib::Log::Formatter.show_time = true