diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG
index a7404078c4df7381bfaf485eab1971f023000ace..5a91d7d07adbf160edf9bd10faba641374908216 100644
--- a/actionwebservice/CHANGELOG
+++ b/actionwebservice/CHANGELOG
@@ -1,3 +1,7 @@
+*SVN*
+
+* Fix scaffolding for Action Pack controller changes
+
 *0.8.0* (6 July, 2005)
 
 * Fix WSDL generation by aliasing #inherited instead of trying to overwrite it, or the WSDL action may end up not being defined in the controller
diff --git a/actionwebservice/lib/action_web_service/scaffolding.rb b/actionwebservice/lib/action_web_service/scaffolding.rb
index da3d6c137c494559a3897df890571b64dc7dcdef..3f0399405c6a856706251def07ae5de0f4e52c91 100644
--- a/actionwebservice/lib/action_web_service/scaffolding.rb
+++ b/actionwebservice/lib/action_web_service/scaffolding.rb
@@ -141,6 +141,7 @@ def public_method_name(service_name, method_name)
 
             def prepare_request(new_request, service_name, method_name)
               new_request.parameters.update(request.parameters)
+              request.env.each{ |k, v| new_request.env[k] = v unless new_request.env.has_key?(k) }
               if web_service_dispatching_mode == :layered && @protocol.is_a?(ActionWebService::Protocol::Soap::SoapProtocol)
                 new_request.env['HTTP_SOAPACTION'] = "/\#{controller_name()}/\#{service_name}/\#{method_name}"
               end