diff --git a/docs/NEWS b/docs/NEWS
index 6b64436f..0efadfdc 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.2 ()
 ------------------------------------------------------------------------
 
+    * Moved drag+drop and YahooUI library into templates/default/ to
+      be used in shared installation environments (garvinhicking)
+
     * Improve WP importer by only fetching real posts (attachments/static
       only optional) and splitting a post into extended/normal entry.
       Thanks to jtb!
diff --git a/include/admin/plugins.inc.php b/include/admin/plugins.inc.php
index beab2c8d..baa669f5 100644
--- a/include/admin/plugins.inc.php
+++ b/include/admin/plugins.inc.php
@@ -472,7 +472,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
     <div><?php echo BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS ?></div>
 <?php
     if (!isset($serendipity['eyecandy']) || serendipity_db_bool($serendipity['eyecandy'])) {
-        echo '<script src="bundled-libs/dragdrop.js" type="text/javascript"></script>';
+        echo '<script src="' . serendipity_getTemplateFile('dragdrop.js') . '" type="text/javascript"></script>';
         echo '<div class="warning js_warning"><em>' . PREFERENCE_USE_JS_WARNING . '</em></div>';
     }
 
diff --git a/bundled-libs/YahooUI/treeview/YAHOO.js b/templates/default/YahooUI/treeview/YAHOO.js
similarity index 100%
rename from bundled-libs/YahooUI/treeview/YAHOO.js
rename to templates/default/YahooUI/treeview/YAHOO.js
diff --git a/bundled-libs/YahooUI/treeview/license.txt b/templates/default/YahooUI/treeview/license.txt
similarity index 100%
rename from bundled-libs/YahooUI/treeview/license.txt
rename to templates/default/YahooUI/treeview/license.txt
diff --git a/bundled-libs/YahooUI/treeview/treeview.js b/templates/default/YahooUI/treeview/treeview.js
similarity index 100%
rename from bundled-libs/YahooUI/treeview/treeview.js
rename to templates/default/YahooUI/treeview/treeview.js
diff --git a/templates/default/admin/media_choose.tpl b/templates/default/admin/media_choose.tpl
index 5b7cf470..00c451b3 100644
--- a/templates/default/admin/media_choose.tpl
+++ b/templates/default/admin/media_choose.tpl
@@ -46,12 +46,12 @@
 
 
         </style>
-        <script type="text/javascript" src="bundled-libs/dragdrop.js" ></script>
-        <script type="text/javascript" src="bundled-libs/imgedit.js" ></script>
+        <script type="text/javascript" src="{serendipity_getFile file='dragdrop.js'}" ></script>
+        <script type="text/javascript" src="{serendipity_getFile file='imgedit.js'}" ></script>
         {/if}
 
-        <script type="text/javascript" src="bundled-libs/YahooUI/treeview/YAHOO.js"></script>
-        <script type="text/javascript" src="bundled-libs/YahooUI/treeview/treeview.js" ></script>
+        <script type="text/javascript" src="{serendipity_getFile file='YahooUI/treeview/YAHOO.js'}"></script>
+        <script type="text/javascript" src="{serendipity_getFile file='YahooUI/treeview/treeview.js'}"></script>
     </head>
 
     <script type="text/javascript">
diff --git a/bundled-libs/dragdrop.js b/templates/default/dragdrop.js
similarity index 100%
rename from bundled-libs/dragdrop.js
rename to templates/default/dragdrop.js
diff --git a/bundled-libs/imgedit.js b/templates/default/imgedit.js
similarity index 100%
rename from bundled-libs/imgedit.js
rename to templates/default/imgedit.js