diff --git a/Library/Homebrew/hardware.rb b/Library/Homebrew/hardware.rb
index c7756dd3b5..67a190f002 100644
--- a/Library/Homebrew/hardware.rb
+++ b/Library/Homebrew/hardware.rb
@@ -9,6 +9,8 @@ module Hardware
       OPTIMIZATION_FLAGS = {
         core2: "-march=core2",
         core: "-march=prescott",
+        armv6: "-march=armv6",
+        armv8: "-march=armv8-a",
         dunno: "-march=native",
       }.freeze
 
@@ -147,6 +149,12 @@ module Hardware
       else
         :core
       end
+    elsif Hardware::CPU.arm?
+      if Hardware::CPU.is_64_bit?
+        :armv8
+      else
+        :armv6
+      end
     else
       Hardware::CPU.family
     end