diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index b66f3c878be1..a0bef51627b6 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -237,6 +237,15 @@ def check_for_broken_symlinks
   end
 end
 
+def check_for_unsupported_osx
+  if MacOS.version >= "10.11" then <<-EOS.undent
+    You are using OS X #{MacOS.version}.
+    We do not provide support for this pre-release version.
+    You may encounter build failures or other breakage.
+    EOS
+  end
+end
+
 if MacOS.version >= "10.9"
   def check_for_installed_developer_tools
     unless MacOS::Xcode.installed? || MacOS::CLT.installed? then <<-EOS.undent
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index d37b10c910eb..7f685b706bfe 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -112,6 +112,7 @@ def check_writable_install_location
   def check_xcode
     checks = Checks.new
     %w[
+      check_for_unsupported_osx
       check_for_installed_developer_tools
       check_xcode_license_approved
       check_for_osx_gcc_installer
diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb
index 7eb053a7c95f..bad8d2c2d4c0 100644
--- a/Library/Homebrew/exceptions.rb
+++ b/Library/Homebrew/exceptions.rb
@@ -216,6 +216,11 @@ def dump
       puts "These open issues may also help:"
       puts issues.map{ |i| "#{i['title']} (#{i['html_url']})" }.join("\n")
     end
+
+    if MacOS.version >= "10.11"
+      require "cmd/doctor"
+      opoo Checks.new.check_for_unsupported_osx
+    end
   end
 end
 
diff --git a/Library/brew.rb b/Library/brew.rb
index 1441f347be7f..8b8376422e75 100755
--- a/Library/brew.rb
+++ b/Library/brew.rb
@@ -50,15 +50,6 @@
   EOABORT
 end
 
-if OS.mac? && MacOS.version == "10.11"
-  opoo <<-EOS.undent
-    Although Homebrew has added initial recognition of 10.11, it is unsupported.
-    You may encounter breakage or other failure and there is no guarantee
-    Homebrew can resolve those issues until El Capitan is stable.
-
-  EOS
-end
-
 # Many Pathname operations use getwd when they shouldn't, and then throw
 # odd exceptions. Reduce our support burden by showing a user-friendly error.
 Dir.getwd rescue abort "The current working directory doesn't exist, cannot proceed."