diff --git a/src/acpi/Makefile.inc b/src/acpi/Makefile.inc
index e99110ec24..068c592db7 100644
--- a/src/acpi/Makefile.inc
+++ b/src/acpi/Makefile.inc
@@ -1,4 +1,15 @@
 # SPDX-License-Identifier: GPL-2.0-only
 # This file is part of the coreboot project.
 
-ramstage-$(CONFIG_HAVE_ACPI_TABLES) += sata.c
+ifeq ($(CONFIG_HAVE_ACPI_TABLES),y)
+
+ramstage-y += acpi.c
+ramstage-y += acpi_device.c
+ramstage-y += acpi_pld.c
+ramstage-y += acpigen.c
+ramstage-y += acpigen_dsm.c
+ramstage-y += acpigen_ps2_keybd.c
+
+ramstage-y += sata.c
+
+endif # CONFIG_GENERATE_ACPI_TABLES
diff --git a/src/arch/x86/acpi.c b/src/acpi/acpi.c
similarity index 100%
rename from src/arch/x86/acpi.c
rename to src/acpi/acpi.c
diff --git a/src/arch/x86/acpi_device.c b/src/acpi/acpi_device.c
similarity index 100%
rename from src/arch/x86/acpi_device.c
rename to src/acpi/acpi_device.c
diff --git a/src/arch/x86/acpi_pld.c b/src/acpi/acpi_pld.c
similarity index 100%
rename from src/arch/x86/acpi_pld.c
rename to src/acpi/acpi_pld.c
diff --git a/src/arch/x86/acpigen.c b/src/acpi/acpigen.c
similarity index 100%
rename from src/arch/x86/acpigen.c
rename to src/acpi/acpigen.c
diff --git a/src/arch/x86/acpigen_dsm.c b/src/acpi/acpigen_dsm.c
similarity index 100%
rename from src/arch/x86/acpigen_dsm.c
rename to src/acpi/acpigen_dsm.c
diff --git a/src/arch/x86/acpigen_ps2_keybd.c b/src/acpi/acpigen_ps2_keybd.c
similarity index 100%
rename from src/arch/x86/acpigen_ps2_keybd.c
rename to src/acpi/acpigen_ps2_keybd.c
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 2d007094c7..aa1f5fef5f 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -230,12 +230,6 @@ $(CONFIG_CBFS_PREFIX)/postcar-compression := none
 
 ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32)$(CONFIG_ARCH_RAMSTAGE_X86_64),y)
 
-ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
-ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpigen.c
-ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpigen_dsm.c
-ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi_device.c
-ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi_pld.c
-ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpigen_ps2_keybd.c
 ramstage-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.c
 ramstage-$(CONFIG_ACPI_BERT) += acpi_bert_storage.c
 ramstage-y += c_start.S