diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc
index 771784e6ff..3e8a6648f4 100644
--- a/src/cpu/x86/Makefile.inc
+++ b/src/cpu/x86/Makefile.inc
@@ -4,6 +4,7 @@ romstage-$(CONFIG_CACHE_AS_RAM) += car.c
 endif
 endif
 
+subdirs-y += pae
 subdirs-$(CONFIG_PARALLEL_MP) += name
 ramstage-$(CONFIG_PARALLEL_MP) += mp_init.c
 ramstage-$(CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING) += mirror_payload.c
diff --git a/src/cpu/x86/pae/Makefile.inc b/src/cpu/x86/pae/Makefile.inc
index 060720c898..62176d20b8 100644
--- a/src/cpu/x86/pae/Makefile.inc
+++ b/src/cpu/x86/pae/Makefile.inc
@@ -1 +1,6 @@
-ramstage-$(CONFIG_CPU_AMD_MODEL_FXX) += pgtbl.c
+bootblock-y += pgtbl.c
+verstage-y += pgtbl.c
+romstage-y += pgtbl.c
+postcar-y += pgtbl.c
+ramstage-y += pgtbl.c
+smm-y += pgtbl.c
diff --git a/src/cpu/x86/pae/pgtbl.c b/src/cpu/x86/pae/pgtbl.c
index 3532e9781e..0c4bff5067 100644
--- a/src/cpu/x86/pae/pgtbl.c
+++ b/src/cpu/x86/pae/pgtbl.c
@@ -16,9 +16,12 @@
 #include <compiler.h>
 #include <console/console.h>
 #include <cpu/cpu.h>
+#include <arch/cpu.h>
 #include <cpu/x86/pae.h>
+#include <rules.h>
 #include <string.h>
 
+#if ENV_RAMSTAGE
 static void paging_off(void)
 {
 	__asm__ __volatile__ (
@@ -115,3 +118,4 @@ void *map_2M_page(unsigned long page)
 		result = (void *)(0x80000000 | ((page & 0x3ff) << 21));
 	return result;
 }
+#endif