diff --git a/repos/base-foc/etc/specs.conf b/repos/base-foc/etc/specs.conf
index f5ae8ffc5..3ef6e913a 100644
--- a/repos/base-foc/etc/specs.conf
+++ b/repos/base-foc/etc/specs.conf
@@ -1 +1,5 @@
 SPECS += foc
+
+ifneq ($(filter x86_%,$(SPECS)),)
+SPECS += pci acpi ps2 vesa framebuffer
+endif
diff --git a/repos/base-foc/mk/spec/foc_arm.mk b/repos/base-foc/mk/spec/foc_arm.mk
deleted file mode 100644
index f5ae8ffc5..000000000
--- a/repos/base-foc/mk/spec/foc_arm.mk
+++ /dev/null
@@ -1 +0,0 @@
-SPECS += foc
diff --git a/repos/base-foc/mk/spec/foc_arndale.mk b/repos/base-foc/mk/spec/foc_arndale.mk
deleted file mode 100644
index 22d37dca8..000000000
--- a/repos/base-foc/mk/spec/foc_arndale.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-SPECS += foc_arm arndale
-
-include $(call select_from_repositories,mk/spec/fpu_vfpv3.mk)
-include $(call select_from_repositories,mk/spec/arndale.mk)
-include $(call select_from_repositories,mk/spec/foc_arm.mk)
diff --git a/repos/base-foc/mk/spec/foc_imx53.mk b/repos/base-foc/mk/spec/foc_imx53.mk
deleted file mode 100644
index dced50930..000000000
--- a/repos/base-foc/mk/spec/foc_imx53.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-SPECS += foc_arm imx53 imx53_qsb
-
-# add repository-relative include paths
-REP_INC_DIR += include/spec/imx53_qsb
-
-include $(call select_from_repositories,mk/spec/imx53.mk)
-include $(call select_from_repositories,mk/spec/foc_arm.mk)
diff --git a/repos/base-foc/mk/spec/foc_odroid_x2.mk b/repos/base-foc/mk/spec/foc_odroid_x2.mk
deleted file mode 100644
index 53b5113f7..000000000
--- a/repos/base-foc/mk/spec/foc_odroid_x2.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-SPECS += foc_arm odroid_x2
-
-include $(call select_from_repositories,mk/spec/odroid_x2.mk)
-include $(call select_from_repositories,mk/spec/foc_arm.mk)
diff --git a/repos/base-foc/mk/spec/foc_panda.mk b/repos/base-foc/mk/spec/foc_panda.mk
deleted file mode 100644
index 1df406127..000000000
--- a/repos/base-foc/mk/spec/foc_panda.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-SPECS += foc_arm panda
-
-include $(call select_from_repositories,mk/spec/panda.mk)
-include $(call select_from_repositories,mk/spec/foc_arm.mk)
diff --git a/repos/base-foc/mk/spec/foc_pbxa9.mk b/repos/base-foc/mk/spec/foc_pbxa9.mk
deleted file mode 100644
index 45c627d33..000000000
--- a/repos/base-foc/mk/spec/foc_pbxa9.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-SPECS += foc_arm pbxa9
-
-include $(call select_from_repositories,mk/spec/pbxa9.mk)
-include $(call select_from_repositories,mk/spec/foc_arm.mk)
diff --git a/repos/base-foc/mk/spec/foc_rpi.mk b/repos/base-foc/mk/spec/foc_rpi.mk
deleted file mode 100644
index 2c8202975..000000000
--- a/repos/base-foc/mk/spec/foc_rpi.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-SPECS += foc_arm rpi
-
-include $(call select_from_repositories,mk/spec/rpi.mk)
-include $(call select_from_repositories,mk/spec/foc_arm.mk)
diff --git a/repos/base-foc/mk/spec/foc_x86_32.mk b/repos/base-foc/mk/spec/foc_x86_32.mk
deleted file mode 100644
index 920757bce..000000000
--- a/repos/base-foc/mk/spec/foc_x86_32.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SPECS += x86_32 foc pci ps2 vesa framebuffer
-
-include $(call select_from_repositories,mk/spec/x86_32.mk)
diff --git a/repos/base-foc/mk/spec/foc_x86_64.mk b/repos/base-foc/mk/spec/foc_x86_64.mk
deleted file mode 100644
index 15560e161..000000000
--- a/repos/base-foc/mk/spec/foc_x86_64.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SPECS += x86_64 foc pci ps2 vesa framebuffer
-
-include $(call select_from_repositories,mk/spec/x86_64.mk)