diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 229071b21d..8d9d4178f9 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.1"   => { :clang => "6.0", :clang_build => 600 },
     }
 
     def compilers_standard?
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index 338fa1f438..a29192fd20 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -14,11 +14,11 @@ module OS
         when "10.7"  then "4.6.3"
         when "10.8"  then "5.1.1"
         when "10.9"  then "5.1.1"
-        when "10.10" then "6.0"
+        when "10.10" then "6.1"
         else
           # Default to newest known version of Xcode for unreleased OSX versions.
           if MacOS.version > "10.10"
-            "6.0"
+            "6.1"
           else
             raise "Mac OS X '#{MacOS.version}' is invalid"
           end