diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index b6b2df40ca78ed24354f6a8eca4f62bc7cc802fe..ea70359b02d09660147fb5066684452c6f9c1698 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -454,7 +454,8 @@ source "drivers/firmware/Kconfig"
 
 choice
 	prompt "High Memory Support"
-	default NOHIGHMEM
+	default HIGHMEM4G if !X86_NUMAQ
+	default HIGHMEM64G if X86_NUMAQ
 
 config NOHIGHMEM
 	bool "off"