diff --git a/eclipse/servlet/.classpath b/eclipse/servlet/.classpath
index 85d33bd..918629d 100644
--- a/eclipse/servlet/.classpath
+++ b/eclipse/servlet/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry excluding="com/google/gwt/i18n/rebind/|com/google/gwt/i18n/tools/|com/google/gwt/junit/*.java|com/google/gwt/junit/benchmarks/|com/google/gwt/junit/client/Benchmark.java|com/google/gwt/junit/client/GWTTestCase.java|com/google/gwt/junit/rebind/|com/google/gwt/junit/remote/|com/google/gwt/junit/server/|com/google/gwt/junit/tools/|com/google/gwt/user/rebind/|com/google/gwt/user/tools/" kind="src" path="core/src"/>
+	<classpathentry excluding="**/rebind/|**/tools/|com/google/gwt/json/|com/google/gwt/junit/*.java|com/google/gwt/junit/benchmarks/|com/google/gwt/junit/client/Benchmark.java|com/google/gwt/junit/client/GWTTestCase.java|com/google/gwt/junit/remote/|com/google/gwt/junit/server/" kind="src" path="core/src"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-3.8.1.jar" sourcepath="/GWT_TOOLS/lib/junit/junit-3.8.1-src.zip"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/servlet-api-2.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/servlet/build.xml b/servlet/build.xml
index 00db8f8..0a830ff 100755
--- a/servlet/build.xml
+++ b/servlet/build.xml
@@ -11,19 +11,15 @@
 		<mkdir dir="${gwt.build.lib}" />
 		<gwt.jar>
 			<fileset dir="${gwt.user.bin}">
-				<exclude name="com/google/gwt/i18n/rebind/**" />
-				<exclude name="com/google/gwt/i18n/tools/**" />
+				<exclude name="**/rebind/**" />
+				<exclude name="**/tools/**" />
 				<exclude name="com/google/gwt/json/**" />
 				<exclude name="com/google/gwt/junit/*" />
 				<exclude name="com/google/gwt/junit/benchmarks/**" />
 				<exclude name="com/google/gwt/junit/client/Benchmark.*" />
 				<exclude name="com/google/gwt/junit/client/GWTTestCase.*" />
-				<exclude name="com/google/gwt/junit/rebind/**" />
 				<exclude name="com/google/gwt/junit/remote/**" />
 				<exclude name="com/google/gwt/junit/server/**" />
-				<exclude name="com/google/gwt/junit/tools/**" />
-				<exclude name="com/google/gwt/user/rebind/**" />
-				<exclude name="com/google/gwt/user/tools/**" />
 			</fileset>
 		</gwt.jar>
 	</target>