diff --git a/Rakefile b/Rakefile
index 80aaa17..24f590c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -31,9 +31,10 @@ end
 task :dojo do
   print "Packaging for dojo\n"
   source = "mustache-dojo"
-  target_js = "dojo.mustache.js"
-  `cat #{source}/#{target_js}.tpl.pre mustache.js #{source}/#{target_js}.tpl.post > #{target_js}`
-  print "Done, see ./#{target_js}\n"
+  target_js = "mustache.js"
+  `mkdir -p dojox; mkdir -p dojox/string`
+  `cat #{source}/#{target_js}.tpl.pre mustache.js #{source}/#{target_js}.tpl.post > dojox/string/#{target_js}`
+  print "Done, see ./dojox/string/#{target_js} Include using dojo.require('dojox.string.mustache.'); \n"
 end
 
 
diff --git a/mustache-dojo/dojo.mustache.js.tpl.post b/mustache-dojo/mustache.js.tpl.post
similarity index 100%
rename from mustache-dojo/dojo.mustache.js.tpl.post
rename to mustache-dojo/mustache.js.tpl.post
diff --git a/mustache-dojo/dojo.mustache.js.tpl.pre b/mustache-dojo/mustache.js.tpl.pre
similarity index 50%
rename from mustache-dojo/dojo.mustache.js.tpl.pre
rename to mustache-dojo/mustache.js.tpl.pre
index 568b9ab..ac9a308 100644
--- a/mustache-dojo/dojo.mustache.js.tpl.pre
+++ b/mustache-dojo/mustache.js.tpl.pre
@@ -1,9 +1,9 @@
 /*
 Shameless port of a shameless port
-@defunkt => @janl => @aq
+@defunkt => @janl => @aq => @voodootikigod
  
 See http://github.com/defunkt/mustache for more info.
 */
 
-dojo.provide("dojo.mustache");
-(function(d) {
+dojo.provide("dojox.string.mustache");
+;(function(d) {