diff --git a/Makefile b/Makefile
index 181362bd5c..d8a8dd34e2 100644
--- a/Makefile
+++ b/Makefile
@@ -21,16 +21,16 @@ all:
 	bk -r co ; true
 	$(MAKE) -C xen
 	$(MAKE) -C tools/balloon
+	$(MAKE) -C tools/control
 	$(MAKE) -C tools/domain_builder
-	$(MAKE) -C tools/domctl
 	$(MAKE) -C tools/internal
 	$(MAKE) -C tools/vdmanager
 
 install: all
 	$(MAKE) -C xen install
 	$(MAKE) -C tools/balloon install
+	$(MAKE) -C tools/control install
 	$(MAKE) -C tools/domain_builder install
-	$(MAKE) -C tools/domctl install
 	$(MAKE) -C tools/internal install
 	$(MAKE) -C tools/vdmanager install
 
@@ -38,8 +38,8 @@ install: all
 clean:
 	$(MAKE) -C xen clean
 	$(MAKE) -C tools/balloon clean
+	$(MAKE) -C tools/control clean
 	$(MAKE) -C tools/domain_builder clean
-	$(MAKE) -C tools/domctl clean
 	$(MAKE) -C tools/internal clean
 	$(MAKE) -C tools/vdmanager clean
 
diff --git a/tools/control/build.properties b/tools/control/build.properties
index 9e375cbfdc..bdeef257b4 100644
--- a/tools/control/build.properties
+++ b/tools/control/build.properties
@@ -1,8 +1,8 @@
-catalina.home=/anfs/scratch/labyrinth/ach61/jakarta-tomcat-4.1.24
+catalina.home=/usr/groups/xeno/build_tools/jakarta-tomcat-4.1.24
 manager.url=http://mousetrap-0.xeno.cl.cam.ac.uk:80/manager
 manager.username=hobbes
 manager.password=tiger
 compile.optimize=false
-build.home=/anfs/scratch/labyrinth/ach61/xeno-clone/xeno.bk/tools/control/build-xen
+build.home=${basedir}/build-xen
 app.name=xenctl