diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 8d9d4178f9..5d35790ce5 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -207,6 +207,7 @@ module OS
       "5.1"   => { :clang => "5.1", :clang_build => 503 },
       "5.1.1" => { :clang => "5.1", :clang_build => 503 },
       "6.0"   => { :clang => "6.0", :clang_build => 600 },
+      "6.0.1" => { :clang => "6.0", :clang_build => 600 },
       "6.1"   => { :clang => "6.0", :clang_build => 600 },
     }
 
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index a29192fd20..5cf40277d5 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -13,7 +13,7 @@ module OS
         when "10.6"  then "3.2.6"
         when "10.7"  then "4.6.3"
         when "10.8"  then "5.1.1"
-        when "10.9"  then "5.1.1"
+        when "10.9"  then "6.0.1"
         when "10.10" then "6.1"
         else
           # Default to newest known version of Xcode for unreleased OSX versions.
@@ -160,8 +160,10 @@ module OS
       end
 
       def latest_version
-        if MacOS.version >= "10.8"
-          "503.0.40"
+        case MacOS.version
+        when "10.10" then "600.0.54"
+        when "10.9"  then "600.0.51"
+        when "10.8"  then "503.0.40"
         else
           "425.0.28"
         end