diff --git a/tool/run/boot_dir/linux b/tool/run/boot_dir/linux
index 6ec260a654..ba39a800c4 100644
--- a/tool/run/boot_dir/linux
+++ b/tool/run/boot_dir/linux
@@ -16,7 +16,7 @@ proc run_boot_dir {binaries} {
 		if {[file exists $src_binary_path]} {
 			exec ln -sf $src_binary_path [run_dir]/genode/$binary
 		} else {
-			lappend missing_boot_modules $binary
+			lappend missing_boot_modules [kernel_specific_binary $binary]
 		}
 	}
 	if {[llength $missing_boot_modules]} {
@@ -31,35 +31,35 @@ proc run_boot_dir {binaries} {
 	# Save config part of the image.elf for easy inspection
 	exec cp -f [run_dir]/genode/config [run_dir].config
 
-        if {[have_board pc]} {
+	if {[have_board pc]} {
 
-            build_initrd $binaries
+		build_initrd $binaries
 
-            copy_file [genode_dir]/tool/boot/vmlinuz [run_dir]/vmlinuz
+		copy_file [genode_dir]/tool/boot/vmlinuz [run_dir]/vmlinuz
 
-            if {[have_include "image/iso"]} {
-                install_iso_bootloader_to_run_dir
-            }
+		if {[have_include "image/iso"]} {
+			install_iso_bootloader_to_run_dir
+		}
 
-            if {[have_include "image/uefi"]} {
+		if {[have_include "image/uefi"]} {
 
-                exec mkdir -p [run_dir]/efi/boot
-                exec cp [get_grub2_dir]/boot/grub2/grub2_32.efi [run_dir]/efi/boot/bootia32.efi
-                exec cp [get_grub2_dir]/boot/grub2/grub2_64.efi [run_dir]/efi/boot/bootx64.efi
-                exec mkdir -p [run_dir]/boot/grub
-            }
+			exec mkdir -p [run_dir]/efi/boot
+			exec cp [get_grub2_dir]/boot/grub2/grub2_32.efi [run_dir]/efi/boot/bootia32.efi
+			exec cp [get_grub2_dir]/boot/grub2/grub2_64.efi [run_dir]/efi/boot/bootx64.efi
+			exec mkdir -p [run_dir]/boot/grub
+		}
 
-            set fh [open "[run_dir]/boot/grub/grub.cfg" "WRONLY CREAT TRUNC"]
-            puts $fh "set timeout=0"
-            puts $fh "menuentry 'Genode on Linux' {"
-            puts $fh " insmod linux"
-            puts $fh " linux /vmlinuz console=ttyS0,115200 amd_iommu=off intel_iommu=off"
-            puts $fh " initrd /initrd"
-            puts $fh "}"
-            close $fh
+		set fh [open "[run_dir]/boot/grub/grub.cfg" "WRONLY CREAT TRUNC"]
+		puts $fh "set timeout=0"
+		puts $fh "menuentry 'Genode on Linux' {"
+		puts $fh " insmod linux"
+		puts $fh " linux /vmlinuz console=ttyS0,115200 amd_iommu=off intel_iommu=off"
+		puts $fh " initrd /initrd"
+		puts $fh "}"
+		close $fh
 
-            run_image
-        }
+		run_image
+	}
 }