diff --git a/src/acpi/Makefile.inc b/src/acpi/Makefile.inc
index 068c592db7..09ff9f1e58 100644
--- a/src/acpi/Makefile.inc
+++ b/src/acpi/Makefile.inc
@@ -12,4 +12,12 @@ ramstage-y += acpigen_ps2_keybd.c
 
 ramstage-y += sata.c
 
+ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/acpi_tables.c),)
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/acpi_tables.c
+endif
+$(eval $(call asl_template,dsdt))
+ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/fadt.c),)
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c
+endif
+
 endif # CONFIG_GENERATE_ACPI_TABLES
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index aa1f5fef5f..c29d5edf23 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -281,15 +281,6 @@ endif
 ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/reset.c),)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/reset.c
 endif
-ifeq ($(CONFIG_HAVE_ACPI_TABLES),y)
-ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/acpi_tables.c),)
-ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/acpi_tables.c
-endif
-$(eval $(call asl_template,dsdt))
-ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/fadt.c),)
-ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c
-endif
-endif # CONFIG_GENERATE_ACPI_TABLES
 
 ramstage-libs ?=