diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json
index e691334dc..461e51979 100644
--- a/src/node/utils/tar.json
+++ b/src/node/utils/tar.json
@@ -1,12 +1,7 @@
 {
   "pad.js": [
-    "jquery.js"
-  , "underscore.js"
-  , "security.js"
-  , "pad.js"
-  , "ace2_common.js"
+    "pad.js"
   , "pad_utils.js"
-  , "json2.js"
   , "pad_cookie.js"
   , "pad_editor.js"
   , "pad_editbar.js"
@@ -23,13 +18,9 @@
   , "farbtastic.js"
   ]
 , "timeslider.js": [
-    "jquery.js"
-  , "underscore.js"
-  , "security.js"
-  , "json2.js"
+    "timeslider.js"
   , "colorutils.js"
   , "draggable.js"
-  , "ace2_common.js"
   , "pad_utils.js"
   , "pad_cookie.js"
   , "pad_editor.js"
@@ -46,12 +37,10 @@
   , "broadcast.js"
   , "broadcast_slider.js"
   , "broadcast_revisions.js"
-  , "timeslider.js"
   ]
 , "ace2_inner.js": [
-    "ace2_common.js"
+    "ace2_inner.js"
   , "underscore.js"
-  , "rjquery.js"
   , "AttributePool.js"
   , "Changeset.js"
   , "ChangesetUtils.js"
@@ -66,6 +55,17 @@
   , "linestylefilter.js"
   , "domline.js"
   , "AttributeManager.js"
-  , "ace2_inner.js"
+  ]
+, "ace2_common.js": [
+    "ace2_common.js"
+  , "jquery.js"
+  , "rjquery.js"
+  , "underscore.js"
+  , "security.js"
+  , "json2.js"
+  , "pluginfw/plugins.js"
+  , "pluginfw/hooks.js"
+  , "pluginfw/async.js"
+  , "pluginfw/parent_require.js"
   ]
 }
diff --git a/src/package.json b/src/package.json
index 0b76ec2ed..c46abbbf6 100644
--- a/src/package.json
+++ b/src/package.json
@@ -10,7 +10,7 @@
                         "name": "Robin Buse" }
                      ],
   "dependencies"   : {
-                      "yajsml"              : "1.1.2",
+                      "yajsml"              : "1.1.3",
                       "request"             : "2.9.100",
                       "require-kernel"      : "1.0.5",
                       "resolve"             : "0.2.1",
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 0003eedf2..8cb9f1884 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -178,18 +178,17 @@ require.setGlobalKeyPath("require");\n\
   function pushScriptsTo(buffer) {
     /* Folling is for packaging regular expression. */
     /* $$INCLUDE_JS("../javascripts/src/ace2_inner.js?callback=require.define"); */
+    /* $$INCLUDE_JS("../javascripts/src/ace2_common.js?callback=require.define"); */
     var ACE_SOURCE = '../javascripts/src/ace2_inner.js?callback=require.define';
+    var ACE_COMMON = '../javascripts/src/ace2_common.js?callback=require.define';
     if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) {
       buffer.push('<script type="text/javascript">');
       buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);
-      buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
+      buffer.push(Ace2Editor.EMBEDED[ACE_COMMON]);
       buffer.push('<\/script>');
     } else {
-      file = ACE_SOURCE;
       buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>');
-      buffer.push('<script type="text/javascript">');
-      buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
-      buffer.push('<\/script>');
+      buffer.push('<script type="application/javascript" src="' + ACE_COMMON + '"><\/script>');
     }
   }
   function pushStyleTagsFor(buffer, files) {
@@ -261,8 +260,9 @@ require.setGlobalKeyPath("require");\n\
       pushStyleTagsFor(iframeHTML, includedCSS);
 
       var includedJS = [];
-      var $$INCLUDE_JS = function(filename) {includedJS.push(filename)};
       pushRequireScriptTo(iframeHTML);
+      pushScriptsTo(iframeHTML);
+
       // Inject my plugins into my child.
       iframeHTML.push('\
 <script type="text/javascript">\
@@ -277,7 +277,10 @@ require.setGlobalKeyPath("require");\n\
   });\
 </script>\
 ');
-      pushScriptsTo(iframeHTML);
+
+      iframeHTML.push('<script type="text/javascript">');
+      iframeHTML.push('require("ep_etherpad-lite/static/js/ace2_inner");');
+      iframeHTML.push('<\/script>');
 
       iframeHTML.push('<style type="text/css" title="dynamicsyntax"></style>');
       iframeHTML.push('</head><body id="innerdocbody" class="syntax" spellcheck="false">&nbsp;</body></html>');