diff -ru old/builtin.jam new/builtin.jam
--- old/builtin.jam	2009-09-04 04:27:58.521204735 +0300
+++ new/builtin.jam	2009-09-04 04:34:57.797201703 +0300
@@ -264,8 +264,8 @@
 # The specific instruction set in an architecture to compile.
 feature.feature instruction-set :
     # x86 and x86-64
-    i386 i486 i586 i686 pentium pentium-mmx pentiumpro pentium2 pentium3
-    pentium3m pentium-m pentium4 pentium4m prescott nocona conroe conroe-xe
+    native i386 i486 i586 i686 pentium pentium-mmx pentiumpro pentium2 pentium3
+    pentium3m pentium-m pentium4 pentium4m prescott nocona core2 conroe conroe-xe
     conroe-l allendale mermon mermon-xe kentsfield kentsfield-xe penryn wolfdale
     yorksfield nehalem k6 k6-2 k6-3 athlon athlon-tbird athlon-4 athlon-xp
     athlon-mp k8 opteron athlon64 athlon-fx winchip-c6 winchip2 c3 c3-2
diff -ru old/gcc.jam new/gcc.jam
--- old/gcc.jam	2009-09-04 04:28:35.365203833 +0300
+++ new/gcc.jam	2009-09-04 04:38:08.585201230 +0300
@@ -936,7 +936,8 @@
 # Set architecture/instruction-set options.
 #
 # x86 and compatible
-cpu-flags gcc OPTIONS : x86 : i386 : -march=i386 : default ;
+cpu-flags gcc OPTIONS : x86 : native : -march=native : default ;
+cpu-flags gcc OPTIONS : x86 : i386 : -march=i386 ;
 cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ;
 cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ;
 cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ;
@@ -951,6 +952,7 @@
 cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ;
 cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ;
 cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ;
+cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ;
 cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ;
 cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ;
 cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;