diff --git a/src/config/Config b/src/config/Config
index 4525b8c7dc..1dd23cb30e 100644
--- a/src/config/Config
+++ b/src/config/Config
@@ -1,6 +1,6 @@
 ## This is Architecture independant part of the makefile
 
-option CROSS_COMPILE
+option CROSS_COMPILE=
 
 makedefine CC:=$(CROSS_COMPILE)gcc 
 makedefine CPP:= $(CROSS_COMPILE)gcc -x assembler-with-cpp -DASSEMBLY -E
diff --git a/src/cpu/i786/Config b/src/cpu/i786/Config
index 8f397addd8..5cf7217a99 100644
--- a/src/cpu/i786/Config
+++ b/src/cpu/i786/Config
@@ -1,3 +1,3 @@
-option i786
+option i786=1
 
 object delay_i786.o
diff --git a/src/cpu/p5/Config b/src/cpu/p5/Config
index bda55c403b..c74aff5855 100644
--- a/src/cpu/p5/Config
+++ b/src/cpu/p5/Config
@@ -1,3 +1,3 @@
-option i586
+option i586=1
 object cpuid.o
 #object tsc.o
diff --git a/src/cpu/p6/Config b/src/cpu/p6/Config
index def8b5b766..77c69eae41 100644
--- a/src/cpu/p6/Config
+++ b/src/cpu/p6/Config
@@ -1,5 +1,5 @@
-option i686
-option INTEL_PPRO_MTRR
+option i686=1
+option INTEL_PPRO_MTRR=1
 object microcode.o
 object mtrr.o
 object l2_cache.o
diff --git a/src/mainboard/supermicro/p4dc6/Config b/src/mainboard/supermicro/p4dc6/Config
index 0c1578b5b2..21c873302d 100644
--- a/src/mainboard/supermicro/p4dc6/Config
+++ b/src/mainboard/supermicro/p4dc6/Config
@@ -116,7 +116,7 @@ option HAVE_PIRQ_TABLE=1
 ##
 ## Do not build special code to the keyboard
 ##
-option NO_KEYBOARD
+option NO_KEYBOARD=1
 
 ##
 ## Build code to export an x86 MP table
@@ -165,7 +165,7 @@ option HAVE_MTRR_TABLE=1
 ## We must setup the fixed mtrrs or we confuse SMP secondary
 ## processor identification
 ##
-option ENABLE_FIXED_AND_VARIABLE_MTRRS
+option ENABLE_FIXED_AND_VARIABLE_MTRRS=1
 
 
 ##