diff --git a/Rakefile b/Rakefile
index a1c7920..bc32175 100644
--- a/Rakefile
+++ b/Rakefile
@@ -65,5 +65,4 @@ templated_build "jQuery"
 templated_build "MooTools"
 templated_build "Dojo", :location => "dojox/string"
 templated_build "YUI3", :location => "yui3/mustache"
-templated_build "RequireJS"
 templated_build "qooxdoo"
diff --git a/mustache.js b/mustache.js
index f45009a..c6b6c6b 100644
--- a/mustache.js
+++ b/mustache.js
@@ -2,9 +2,19 @@
  * mustache.js - Logic-less {{mustache}} templates with JavaScript
  * http://github.com/janl/mustache.js
  */
-var Mustache = (typeof module !== "undefined" && module.exports) || {};
+
+var Mustache;
 
 (function (exports) {
+  if (typeof module !== "undefined") {
+    module.exports = exports; // CommonJS
+  } else if (typeof define === "function") {
+    define(exports); // AMD
+  } else {
+    Mustache = exports; // <script>
+  }
+}(function () {
+  var exports = {};
 
   exports.name = "mustache.js";
   exports.version = "0.5.1-dev";
@@ -598,4 +608,6 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
     return _renderer.render(template, view);
   }
 
-})(Mustache);
+  return exports;
+
+}()));
diff --git a/wrappers/requirejs/mustache.js.post b/wrappers/requirejs/mustache.js.post
deleted file mode 100644
index 632fd2a..0000000
--- a/wrappers/requirejs/mustache.js.post
+++ /dev/null
@@ -1,3 +0,0 @@
-
-return Mustache;
-});
\ No newline at end of file
diff --git a/wrappers/requirejs/mustache.js.pre b/wrappers/requirejs/mustache.js.pre
deleted file mode 100644
index 160286d..0000000
--- a/wrappers/requirejs/mustache.js.pre
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
-Shameless port of a shameless port ^ 2
-@defunkt => @janl => @aq => @voodootikigod => @timruffles
- 
-*/
-define(function(){