diff --git a/repos/ports/run/noux_gdb.run b/repos/ports/run/noux_gdb.run
index 7557ecf6f..ba4f8a50a 100644
--- a/repos/ports/run/noux_gdb.run
+++ b/repos/ports/run/noux_gdb.run
@@ -31,6 +31,9 @@ set build_components {
 }
 
 lappend build_components "lib/gdbserver_platform-$::env(KERNEL)"
+lappend_if [have_spec nova] build_components lib/ld/nova
+lappend_if [have_spec foc]  build_components lib/ld/foc
+lappend build_components noux-pkg/[noux_gdb_pkg_name]
 
 # the application to be debugged with GDB
 lappend build_components test/gdb_monitor
@@ -58,8 +61,6 @@ lappend gdb_target_binaries ${gdb_target_binary_name}
 
 create_binary_and_source_tars ${gdb_target_binary_name} ${gdb_target_binaries}
 
-create_boot_directory
-
 append config {
 	<config verbose="yes">
 		<parent-provides>