diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json
index 07e9a7ab2..8fcc45aa2 100644
--- a/src/node/utils/tar.json
+++ b/src/node/utils/tar.json
@@ -2,6 +2,9 @@
   "pad.js": [
     "pad.js"
   , "pad_utils.js"
+  , "$js-cookie/src/js.cookie.js"
+  , "security.js"
+  , "$security.js"
   , "vendors/browser.js"
   , "pad_cookie.js"
   , "pad_editor.js"
@@ -22,12 +25,14 @@
   , "vendors/farbtastic.js"
   , "skin_variants.js"
   , "socketio.js"
+  , "colorutils.js"
   ]
 , "timeslider.js": [
     "timeslider.js"
   , "colorutils.js"
   , "draggable.js"
   , "pad_utils.js"
+  , "$js-cookie/src/js.cookie.js"
   , "vendors/browser.js"
   , "pad_cookie.js"
   , "pad_editor.js"
@@ -46,6 +51,8 @@
   , "broadcast_slider.js"
   , "broadcast_revisions.js"
   , "socketio.js"
+  , "AttributeManager.js"
+  , "ChangesetUtils.js"
   ]
 , "ace2_inner.js": [
     "ace2_inner.js"
@@ -65,6 +72,10 @@
   , "AttributeManager.js"
   , "scroll.js"
   , "caretPosition.js"
+  , "pad_utils.js"
+  , "$js-cookie/src/js.cookie.js"
+  , "security.js"
+  , "$security.js"
   ]
 , "ace2_common.js": [
     "ace2_common.js"
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 40b8625c8..ef14f18f0 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -202,11 +202,12 @@ require.setRootURI("../javascripts/src");\n\
 require.setLibraryURI("../javascripts/lib");\n\
 require.setGlobalKeyPath("require");\n\
 \n\
+// intentially moved before requiring client_plugins to save a 307
+var Ace2Inner = require("ep_etherpad-lite/static/js/ace2_inner");\n\
 var plugins = require("ep_etherpad-lite/static/js/pluginfw/client_plugins");\n\
 plugins.adoptPluginsFromAncestorsOf(window);\n\
 \n\
 $ = jQuery = require("ep_etherpad-lite/static/js/rjquery").jQuery; // Expose jQuery #HACK\n\
-var Ace2Inner = require("ep_etherpad-lite/static/js/ace2_inner");\n\
 \n\
 plugins.ensure(function () {\n\
   Ace2Inner.init();\n\