diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index d9fc652af5..5a0a2a8559 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -31,8 +31,8 @@ config BOARD_INTEL_D945GCLF
 	select USE_PRINTK_IN_CAR
 	select AP_IN_SIPI_WAIT
 	select UDELAY_LAPIC
-	#select HAVE_ACPI_TABLES
-	#select HAVE_SMI_HANDLER
+	select HAVE_ACPI_TABLES
+	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_1024
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/intel/d945gclf/acpi_tables.c b/src/mainboard/intel/d945gclf/acpi_tables.c
index 5b187e77f0..527d708af9 100644
--- a/src/mainboard/intel/d945gclf/acpi_tables.c
+++ b/src/mainboard/intel/d945gclf/acpi_tables.c
@@ -192,7 +192,9 @@ unsigned long acpi_fill_srat(unsigned long current)
 	return current;
 }
 
+#if CONFIG_HAVE_SMI_HANDLER
 void smm_setup_structures(void *gnvs, void *tcg, void *smi1);
+#endif
 
 #define ALIGN_CURRENT current = ((current + 0x0f) & -0x10)
 unsigned long write_acpi_tables(unsigned long start)
@@ -311,8 +313,10 @@ unsigned long write_acpi_tables(unsigned long start)
 	current += 0x100;
 	ALIGN_CURRENT;
 
+#if CONFIG_HAVE_SMI_HANDLER
 	/* And tell SMI about it */
 	smm_setup_structures((void *)current, NULL, NULL);
+#endif
 
 	/* We patched up the DSDT, so we need to recalculate the checksum */
 	dsdt->checksum = 0;