diff --git a/repos/os/src/drivers/acpi/Tupfile b/repos/os/src/drivers/acpi/Tupfile
new file mode 100644
index 000000000..1320bf519
--- /dev/null
+++ b/repos/os/src/drivers/acpi/Tupfile
@@ -0,0 +1,6 @@
+include_rules
+ifneq ($(X86),)
+: foreach ../*.cc *.cc |> !cxx |> %B.o {obj}
+: {obj} |  |> !prg |> acpi_drv {bin}
+: {bin} |> !collect_bin |>
+endif
diff --git a/repos/os/src/drivers/ahci/Tupfile b/repos/os/src/drivers/ahci/Tupfile
new file mode 100644
index 000000000..cff338b12
--- /dev/null
+++ b/repos/os/src/drivers/ahci/Tupfile
@@ -0,0 +1,6 @@
+include_rules
+ifneq ($(X86),)
+: foreach *.cc spec/x86/*.cc |> !cxx |> %B.o {obj}
+: {obj} |  |> !prg |> ahci_drv {bin}
+: {bin} |> !collect_bin |>
+endif
diff --git a/repos/os/src/drivers/ahci/spec/x86/Tupfile b/repos/os/src/drivers/ahci/spec/x86/Tupfile
deleted file mode 100644
index dcb46f704..000000000
--- a/repos/os/src/drivers/ahci/spec/x86/Tupfile
+++ /dev/null
@@ -1,8 +0,0 @@
-include_rules
-ifneq ($(X86),)
-
-: foreach $(SRC_CC) *.cc |> !cxx |> %B.o {obj}
-: {obj} |  |> !prg |> ahci_x86_drv {bin}
-: {bin} |> !collect_bin |>
-
-endif
diff --git a/repos/os/src/drivers/framebuffer/boot/Tupfile b/repos/os/src/drivers/framebuffer/boot/Tupfile
new file mode 100644
index 000000000..5f15a0b6c
--- /dev/null
+++ b/repos/os/src/drivers/framebuffer/boot/Tupfile
@@ -0,0 +1,6 @@
+include_rules
+ifneq ($(X86),)
+: foreach *.cc |> !cxx |> %B.o {obj}
+: {obj} |  |> !prg |> fb_boot_drv {bin}
+: {bin} |> !collect_bin |>
+endif
diff --git a/repos/os/src/drivers/nvme/Tupfile b/repos/os/src/drivers/nvme/Tupfile
new file mode 100644
index 000000000..b5c739f6b
--- /dev/null
+++ b/repos/os/src/drivers/nvme/Tupfile
@@ -0,0 +1,4 @@
+include_rules
+: foreach *.cc |> !cxx |> %B.o {obj}
+: {obj} |  |> !prg |> nvme_drv {bin}
+: {bin} |> !collect_bin |>
diff --git a/repos/os/src/drivers/platform/spec/x86/Tupfile b/repos/os/src/drivers/platform/spec/x86/Tupfile
new file mode 100644
index 000000000..55d4a0dbb
--- /dev/null
+++ b/repos/os/src/drivers/platform/spec/x86/Tupfile
@@ -0,0 +1,6 @@
+include_rules
+ifneq ($(X86),)
+: foreach *.cc |> !cxx |> %B.o {obj}
+: {obj} |  |> !prg |> platform_drv {bin}
+: {bin} |> !collect_bin |>
+endif
diff --git a/repos/os/src/drivers/rtc/Tupfile b/repos/os/src/drivers/rtc/Tupfile
new file mode 100644
index 000000000..5911de6c6
--- /dev/null
+++ b/repos/os/src/drivers/rtc/Tupfile
@@ -0,0 +1,6 @@
+include_rules
+ifneq ($(X86),)
+: foreach *.cc spec/x86/*.cc |> !cxx |> %B.o {obj}
+: {obj} |  |> !prg |> rtc_drv {bin}
+: {bin} |> !collect_bin |>
+endif
diff --git a/repos/os/src/drivers/uart/Tupfile b/repos/os/src/drivers/uart/Tupfile
new file mode 100644
index 000000000..d26c89de8
--- /dev/null
+++ b/repos/os/src/drivers/uart/Tupfile
@@ -0,0 +1,7 @@
+include_rules
+ifneq ($(X86),)
+CPPFLAGS += -Ispec/x86
+: foreach *.cc |> !cxx |> %B.o {obj}
+: {obj} |  |> !prg |> pc_uart_drv {bin}
+: {bin} |> !collect_bin |>
+endif
diff --git a/repos/os/src/drivers/usb_block/Tupfile b/repos/os/src/drivers/usb_block/Tupfile
new file mode 100644
index 000000000..f36cd0560
--- /dev/null
+++ b/repos/os/src/drivers/usb_block/Tupfile
@@ -0,0 +1,4 @@
+include_rules
+: foreach *.cc |> !cxx |> %B.o {obj}
+: {obj} |  |> !prg |> usb_block_drv {bin}
+: {bin} |> !collect_bin |>