diff --git a/main/webapp/WEB-INF/lib-src/butterfly-trunk-sources.jar b/main/webapp/WEB-INF/lib-src/butterfly-trunk-sources.jar
index fa5f71550..5a6a051b7 100644
Binary files a/main/webapp/WEB-INF/lib-src/butterfly-trunk-sources.jar and b/main/webapp/WEB-INF/lib-src/butterfly-trunk-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib/butterfly-trunk.jar b/main/webapp/WEB-INF/lib/butterfly-trunk.jar
index 6e02eed37..3af818924 100644
Binary files a/main/webapp/WEB-INF/lib/butterfly-trunk.jar and b/main/webapp/WEB-INF/lib/butterfly-trunk.jar differ
diff --git a/server/src/com/google/gridworks/Gridworks.java b/server/src/com/google/gridworks/Gridworks.java
index dd3ecb3f7..6f579e55d 100644
--- a/server/src/com/google/gridworks/Gridworks.java
+++ b/server/src/com/google/gridworks/Gridworks.java
@@ -239,6 +239,7 @@ class GridworksServer extends Server {
         ServletHolder servlet = context.getServletHandler().getServlet("gridworks");
         if (servlet != null) {
             servlet.setInitParameter("gridworks.data", getDataDir());
+            servlet.setInitParameter("butterfly.modules.path", getDataDir() + "/extensions");
             servlet.setInitOrder(1);
             servlet.doStart();
         }