diff --git a/Tools/ardupilotwaf/chibios.py b/Tools/ardupilotwaf/chibios.py
index c19bff2cd0..147f65f2d9 100644
--- a/Tools/ardupilotwaf/chibios.py
+++ b/Tools/ardupilotwaf/chibios.py
@@ -145,13 +145,13 @@ def chibios_firmware(self):
     if os.path.exists(bootloader_bin.abspath()):
         hex_target = self.bld.bldnode.find_or_declare('bin/' + link_output.change_ext('.hex').name)
         hex_task = self.create_task('build_intel_hex', src=[bin_target, bootloader_bin], tgt=hex_target)
-        hex_task.set_run_after(generate_apj_task)
+        hex_task.set_run_after(generate_bin_task)
 
     if self.env.DEFAULT_PARAMETERS:
         default_params_task = self.create_task('set_default_parameters',
                                                src=link_output)
         default_params_task.set_run_after(self.link_task)
-        generate_apj_task.set_run_after(default_params_task)
+        generate_bin_task.set_run_after(default_params_task)
     
     if self.bld.options.upload:
         _upload_task = self.create_task('upload_fw', src=apj_target)