diff --git a/repos/os/lib/mk/spec/exynos5/ahci_platform.mk b/repos/os/lib/mk/spec/exynos5/ahci_platform.mk
deleted file mode 100644
index bee43ed6d..000000000
--- a/repos/os/lib/mk/spec/exynos5/ahci_platform.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-SRC_CC = platform.cc
-
-INC_DIR += $(REP_DIR)/src/drivers/ahci
-
-vpath platform.cc $(REP_DIR)/src/drivers/ahci/spec/exynos5
-
diff --git a/repos/os/lib/mk/spec/x86/ahci_platform.mk b/repos/os/lib/mk/spec/x86/ahci_platform.mk
deleted file mode 100644
index 9771ea1dd..000000000
--- a/repos/os/lib/mk/spec/x86/ahci_platform.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-SRC_CC = platform.cc
-
-INC_DIR += $(REP_DIR)/src/drivers/ahci
-
-vpath platform.cc $(REP_DIR)/src/drivers/ahci/spec/x86
-
diff --git a/repos/os/recipes/src/ahci_drv/content.mk b/repos/os/recipes/src/ahci_drv/content.mk
index 701ac3c7d..4ef618423 100644
--- a/repos/os/recipes/src/ahci_drv/content.mk
+++ b/repos/os/recipes/src/ahci_drv/content.mk
@@ -1,11 +1,2 @@
 SRC_DIR = src/drivers/ahci
 include $(GENODE_DIR)/repos/base/recipes/src/content.inc
-
-MIRROR_FROM_REP_DIR := lib/mk/spec/x86/ahci_platform.mk \
-                       lib/mk/spec/exynos5/ahci_platform.mk
-
-content: $(MIRROR_FROM_REP_DIR)
-
-$(MIRROR_FROM_REP_DIR):
-	$(mirror_from_rep_dir)
-
diff --git a/repos/os/run/ahci_bench.run b/repos/os/run/ahci_bench.run
index 98d551bef..4b46c63c0 100644
--- a/repos/os/run/ahci_bench.run
+++ b/repos/os/run/ahci_bench.run
@@ -1,3 +1,4 @@
+assert_spec x86
 
 set mke2fs [installed_command mke2fs]
 set dd     [installed_command dd]
diff --git a/repos/os/run/ahci_block.run b/repos/os/run/ahci_block.run
index 10933e05b..a92393e38 100644
--- a/repos/os/run/ahci_block.run
+++ b/repos/os/run/ahci_block.run
@@ -1,3 +1,4 @@
+assert_spec x86
 
 set mke2fs [installed_command mke2fs]
 set dd     [installed_command dd]
diff --git a/repos/os/run/block_tester.run b/repos/os/run/block_tester.run
index fcabd63d4..705653d1d 100644
--- a/repos/os/run/block_tester.run
+++ b/repos/os/run/block_tester.run
@@ -1,3 +1,5 @@
+assert_spec x86
+
 set use_linux [have_spec linux]
 
 #
diff --git a/repos/os/src/drivers/ahci/spec/exynos5/target.mk b/repos/os/src/drivers/ahci/spec/exynos5/target.mk
new file mode 100644
index 000000000..78df14564
--- /dev/null
+++ b/repos/os/src/drivers/ahci/spec/exynos5/target.mk
@@ -0,0 +1,5 @@
+TARGET   = exynos5_ahci_drv
+REQUIRES = arm_v7
+INC_DIR  = $(call select_from_repositories,include/spec/exynos5)
+
+include $(REP_DIR)/src/drivers/ahci/target.inc
diff --git a/repos/os/src/drivers/ahci/spec/x86/target.mk b/repos/os/src/drivers/ahci/spec/x86/target.mk
new file mode 100644
index 000000000..6cf2512e5
--- /dev/null
+++ b/repos/os/src/drivers/ahci/spec/x86/target.mk
@@ -0,0 +1,5 @@
+TARGET   = ahci_drv
+REQUIRES = x86
+
+include $(REP_DIR)/src/drivers/ahci/target.inc
+
diff --git a/repos/os/src/drivers/ahci/target.inc b/repos/os/src/drivers/ahci/target.inc
new file mode 100644
index 000000000..295ae130b
--- /dev/null
+++ b/repos/os/src/drivers/ahci/target.inc
@@ -0,0 +1,6 @@
+SRC_CC  += main.cc ahci.cc platform.cc
+INC_DIR += $(REP_DIR)/src/drivers/ahci
+LIBS    += base
+
+vpath platform.cc $(PRG_DIR)
+vpath %.cc        $(REP_DIR)/src/drivers/ahci
diff --git a/repos/os/src/drivers/ahci/target.mk b/repos/os/src/drivers/ahci/target.mk
deleted file mode 100644
index 940b5cc2d..000000000
--- a/repos/os/src/drivers/ahci/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET   = ahci_drv
-SRC_CC   = main.cc ahci.cc
-INC_DIR += $(PRG_DIR)
-LIBS    += base ahci_platform
diff --git a/repos/ports/run/noux_fs.run b/repos/ports/run/noux_fs.run
index 6807fc7c9..e43d5cd26 100644
--- a/repos/ports/run/noux_fs.run
+++ b/repos/ports/run/noux_fs.run
@@ -1,3 +1,5 @@
+assert_spec x86
+
 set genext2fs [installed_command genext2fs]
 set e2fsck [installed_command e2fsck]