diff --git a/os/run/ahci.run b/os/run/ahci.run
index 05c85958a..63385e809 100644
--- a/os/run/ahci.run
+++ b/os/run/ahci.run
@@ -1,7 +1,11 @@
+if {![have_spec x86_32]} {
+	puts "\nThe AHCI driver supports the x86_32 architecture only\n"
+	exit 0
+}
+
 #
 # Build
 #
-
 set build_components {
 	core init drivers/timer drivers/pci drivers/acpi
 	drivers/ahci test/ahci
diff --git a/os/src/drivers/acpi/x86/target.mk b/os/src/drivers/acpi/x86/target.mk
index 8b0f34699..9b04a85fd 100644
--- a/os/src/drivers/acpi/x86/target.mk
+++ b/os/src/drivers/acpi/x86/target.mk
@@ -1,5 +1,5 @@
 TARGET   = acpi_drv
-REQUIRES = x86
+REQUIRES = x86_32
 SRC_CC   = main.cc acpi.cc
 LIBS     = cxx env server process
 
diff --git a/os/src/drivers/ahci/target.mk b/os/src/drivers/ahci/target.mk
index 2b752c5da..94ed8f16d 100644
--- a/os/src/drivers/ahci/target.mk
+++ b/os/src/drivers/ahci/target.mk
@@ -1,4 +1,5 @@
-TARGET = ahci_drv
-SRC_CC = main.cc
-LIBS   = cxx env server signal
+TARGET   = ahci_drv
+REQUIRES = x86_32
+SRC_CC   = main.cc
+LIBS     = cxx env server signal