diff --git a/src/server/Makefile b/src/server/Makefile
index 84afae5d2..34ca24143 100644
--- a/src/server/Makefile
+++ b/src/server/Makefile
@@ -12,9 +12,8 @@ gwt:
 
 gf-gwt.jar:
 	mkdir -p gwt/bin/se/chalmers/cs/gf/gwt/client
-	javac -classpath $(GWT_CLASSPATH) -sourcepath gwt/src -d gwt/bin gwt/src/se/chalmers/cs/gf/gwt/client/*.java
+	javac -classpath "$(GWT_CLASSPATH)" -sourcepath gwt/src gwt/src/se/chalmers/cs/gf/gwt/client/*.java
 	jar -cf $@ -C gwt/src se
-	jar -uf $@ -C gwt/bin se
 	cp $@ ../../lib/java
 
 food.pgf: