diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index c5b6ccbfae..9dfdb0c5fa 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -16,10 +16,11 @@ module OS
         when "10.9"  then "6.2"
         when "10.10" then "7.2.1"
         when "10.11" then "7.3.1"
+        when "10.12" then "8.0"
         else
           # Default to newest known version of Xcode for unreleased OSX versions.
           if OS::Mac.prerelease?
-            "7.3.1"
+            "8.0"
           else
             raise "OS X '#{MacOS.version}' is invalid"
           end
@@ -123,7 +124,8 @@ module OS
           when 61      then "6.1"
           when 70      then "7.0"
           when 73      then "7.3"
-          else "7.3"
+          when 80      then "8.0"
+          else "8.0"
         end
       end
 
@@ -161,6 +163,7 @@ module OS
 
       def latest_version
         case MacOS.version
+        when "10.12" then "800.0.24.1"
         when "10.11" then "703.0.31"
         when "10.10" then "700.1.81"
         when "10.9"  then "600.0.57"