diff --git a/Library/Homebrew/extend/os/extend/ENV/shared.rb b/Library/Homebrew/extend/os/extend/ENV/shared.rb
index 405c442912..1a6b2294b7 100644
--- a/Library/Homebrew/extend/os/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/os/extend/ENV/shared.rb
@@ -1 +1,5 @@
-require "extend/os/mac/extend/ENV/shared" if OS.mac?
+if OS.mac?
+  require "extend/os/mac/extend/ENV/shared"
+elsif OS.linux?
+  require "extend/os/linux/extend/ENV/shared"
+end
diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb b/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb
new file mode 100644
index 0000000000..4d938d08fd
--- /dev/null
+++ b/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb
@@ -0,0 +1,10 @@
+module SharedEnvExtension
+  # @private
+  def effective_arch
+    if ARGV.build_bottle?
+      ARGV.bottle_arch || Hardware.oldest_cpu
+    else
+      :native
+    end
+  end
+end
diff --git a/Library/Homebrew/hardware.rb b/Library/Homebrew/hardware.rb
index 311545f18c..65789c1220 100644
--- a/Library/Homebrew/hardware.rb
+++ b/Library/Homebrew/hardware.rb
@@ -7,6 +7,7 @@ module Hardware
 
     class << self
       OPTIMIZATION_FLAGS = {
+        native:  "-march=native",
         nehalem: "-march=nehalem",
         penryn:  "-march=penryn",
         core2:   "-march=core2",