diff --git a/repos/ports/run/noux_gdb.inc b/repos/ports/run/noux_gdb.inc
index 8a41268c75..f427450523 100644
--- a/repos/ports/run/noux_gdb.inc
+++ b/repos/ports/run/noux_gdb.inc
@@ -34,7 +34,9 @@ proc create_binary_tar { application_name application_binaries } {
 proc create_source_tar { application_name application_binaries } {
 	exec mkdir -p bin/${application_name}-src
 	foreach application_binary $application_binaries {
-		set source_files [ exec [cross_dev_prefix]objdump -dl bin/${application_binary} | grep "^/.*:.*" | sed -e "s/:.*//" | uniq ]
+		set binary debug/[kernel_specific_binary ${application_binary} silent]
+		puts "archive sources of $binary"
+		set source_files [ exec [cross_dev_prefix]objdump -dl $binary | grep "^/.*:.*" | sed -e "s/:.*//" | uniq ]
 		foreach source_file ${source_files} {
 			# resolve '..' to avoid problems with 'tar' with parts like '/a/b/../'
 			# where '/a' exists, but '/a/b' does not
diff --git a/tool/run/run b/tool/run/run
index 0cde1b8f8f..c0a80a6426 100755
--- a/tool/run/run
+++ b/tool/run/run
@@ -451,14 +451,16 @@ proc kernel_location_from_config_file { config_file default_location } {
 # case for regular binaries that appear in the boot directory under their
 # original name.
 #
-proc kernel_specific_binary { binary } {
+proc kernel_specific_binary { binary {silent ""} } {
 
 	regsub -all {\.} $binary "_" function_suffix
 	set function_name "binary_name_$function_suffix"
 
 	if {[info procs $function_name] == $function_name} {
 		set binary_name [$function_name]
-		puts "using '$binary_name' as '$binary'"
+		if {$silent != "silent"} {
+			puts "using '$binary_name' as '$binary'"
+		}
 		return [$function_name]
 	}