diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all
index ce27ad5d7f..ba156ae3cb 100755
--- a/wxPython/distrib/all/build-all
+++ b/wxPython/distrib/all/build-all
@@ -91,9 +91,14 @@ def getTasks(config_env):
 #          Job("co-mdk2006.24","distrib/all/build-rpm", ["beast", "co-mdk2006", "mdk2006", "2.4"], env=config_env),
           ])
 
-    xavierTask = Task([
-        Job("xavier.d", "distrib/all/build-deb", ["xavier", "/work/chroot/dapper", "dapper"], env=config_env),
-        Job("xavier.f", "distrib/all/build-deb", ["xavier", "/work/chroot/feisty", "feisty"], env=config_env),
+    cyclopsTask1 = Task([
+        Job("cyclops.d", "distrib/all/build-deb", ["cyclops", "/work/chroot/dapper32", "dapper"], env=config_env),
+        Job("cyclops.d64", "distrib/all/build-deb", ["cyclops", "/work/chroot/dapper64", "dapper64"], env=config_env),
+        ])
+
+    cyclopsTask2 = Task([
+        Job("cyclops.f", "distrib/all/build-deb", ["cyclops", "/work/chroot/feisty32", "feisty"], env=config_env),
+        Job("cyclops.f64", "distrib/all/build-deb", ["cyclops", "/work/chroot/feisty64", "feisty64"], env=config_env),
         ])
 
     buildTasks = [ #jaguarTask,
@@ -101,7 +106,8 @@ def getTasks(config_env):
                    tigerTask,
                    beastTask1,
                    beastTask2,
-                   xavierTask,
+                   cyclopsTask1,
+                   cyclopsTask2,
                    ]
     
     # Finalization.  This is for things that must wait until all the