diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG
index 7417e22bdf208c1af9f63cd72039214f6b7654f7..fd3621f02358cd80d3d4b33dda5a50caa3b287d7 100644
--- a/actionwebservice/CHANGELOG
+++ b/actionwebservice/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fix scaffolding template paths, it was broken on Win32
+
 * Fix that functional testing of :layered controllers failed when using the SOAP protocol
 
 * Allow invocation filters in :direct controllers as well, as they have access to more information regarding the web service request than ActionPack filters
diff --git a/actionwebservice/TODO b/actionwebservice/TODO
index c78cffb2e1d51ed232b3390d03a0ba35b760645d..7c022c14cbc25defa3fbc3dd1c80061cfbf4009d 100644
--- a/actionwebservice/TODO
+++ b/actionwebservice/TODO
@@ -1,6 +1,24 @@
 = Post-1.0
+  - Document/Literal SOAP support
+    - URL-based dispatching, URL identifies method
+
   - Add :rest dispatching mode, a.l.a. Backpack API. Clean up dispatching
     in general. Support vanilla XML-format as a "Rails" protocol?
+    XML::Simple deserialization into params?
+
+      web_service_dispatching_mode :rest
+
+      def method1(params)
+      end
+
+      def method2(params)
+      end
+
+
+      /ws/method1
+        <xml>
+      /ws/method2
+        <yaml>
 
   - Allow locking down a controller to only accept messages for a particular
     protocol.  This will allow us to generate fully conformant error messages
diff --git a/actionwebservice/lib/action_web_service/scaffolding.rb b/actionwebservice/lib/action_web_service/scaffolding.rb
index d2e74b095c87b970b658185243ccfbffb2ecab4b..ff9a23b1e819a8189b8ba1f37c58186a4c7e2800 100644
--- a/actionwebservice/lib/action_web_service/scaffolding.rb
+++ b/actionwebservice/lib/action_web_service/scaffolding.rb
@@ -117,7 +117,7 @@ def render_invocation_scaffold(action)
             end
 
             def scaffold_path(template_name)
-              Pathname.new(File.dirname(__FILE__) + "/templates/scaffolds/" + template_name + ".rhtml").realpath.to_s
+              File.dirname(__FILE__) + "/templates/scaffolds/" + template_name + ".rhtml"
             end
 
             def reset_invocation_response