diff --git a/main/.classpath b/main/.classpath
index f6dc988c0..259b0c5eb 100644
--- a/main/.classpath
+++ b/main/.classpath
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="tests/server/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="webapp/WEB-INF/lib/butterfly-trunk-r24.jar" sourcepath="webapp/WEB-INF/lib-src/butterfly-trunk-r24-sources.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-codec-1.4.jar" sourcepath="webapp/WEB-INF/lib-src/commons-codec-1.4-sources.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-lang-2.5.jar" sourcepath="webapp/WEB-INF/lib-src/commons-lang-2.5-sources.jar"/>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar" sourcepath="webapp/WEB-INF/lib-src/commons-fileupload-1.2.1-sources.jar"/>
@@ -39,5 +38,6 @@
 	<classpathentry kind="lib" path="tests/server/lib/mockito-all-1.8.4.jar" sourcepath="tests/server/lib-src/mockito-all-1.8.4-sources.jar"/>
 	<classpathentry kind="lib" path="tests/server/lib/testng-5.12.1.jar" sourcepath="tests/server/lib-src/testng-5.12.1-sources.jar"/>
 	<classpathentry kind="lib" path="/gridworks-server/lib/servlet-api-2.5.jar" sourcepath="/gridworks-server/lib-src/servlet-api-2.5-sources.jar"/>
+	<classpathentry kind="lib" path="webapp/WEB-INF/lib/butterfly-trunk-r25.jar"/>
 	<classpathentry kind="output" path="webapp/WEB-INF/classes"/>
 </classpath>
diff --git a/main/webapp/WEB-INF/lib-src/butterfly-trunk-r24-sources.jar b/main/webapp/WEB-INF/lib-src/butterfly-trunk-r25-sources.jar
similarity index 63%
rename from main/webapp/WEB-INF/lib-src/butterfly-trunk-r24-sources.jar
rename to main/webapp/WEB-INF/lib-src/butterfly-trunk-r25-sources.jar
index 650ef6041..03c8386de 100644
Binary files a/main/webapp/WEB-INF/lib-src/butterfly-trunk-r24-sources.jar and b/main/webapp/WEB-INF/lib-src/butterfly-trunk-r25-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib/butterfly-trunk-r24.jar b/main/webapp/WEB-INF/lib/butterfly-trunk-r24.jar
deleted file mode 100644
index b12760526..000000000
Binary files a/main/webapp/WEB-INF/lib/butterfly-trunk-r24.jar and /dev/null differ
diff --git a/main/webapp/WEB-INF/lib/butterfly-trunk-r25.jar b/main/webapp/WEB-INF/lib/butterfly-trunk-r25.jar
new file mode 100644
index 000000000..55d149609
Binary files /dev/null and b/main/webapp/WEB-INF/lib/butterfly-trunk-r25.jar differ