diff --git a/Library/Homebrew/blacklist.rb b/Library/Homebrew/blacklist.rb
index 0fdec6e289..5ed0ac459e 100644
--- a/Library/Homebrew/blacklist.rb
+++ b/Library/Homebrew/blacklist.rb
@@ -27,7 +27,7 @@ def blacklisted? name
         sudo easy_install pip
     EOS
   when 'pil' then <<-EOS.undent
-    Instead of PIL, consider `pip install pillow` or `brew install samueljohn/python/pillow`.
+    Instead of PIL, consider `pip install pillow` or `brew install homebrew/python/pillow`.
     EOS
   when 'macruby' then <<-EOS.undent
     MacRuby works better when you install their package:
diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index 0b489b03a2..9941db650e 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -73,7 +73,6 @@ module Homebrew extend self
 
   SEARCHABLE_TAPS = [
     %w{josegonzalez php},
-    %w{samueljohn python},
     %w{marcqualie nginx},
     %w{Homebrew apache},
     %w{Homebrew versions},
@@ -82,6 +81,7 @@ module Homebrew extend self
     %w{Homebrew science},
     %w{Homebrew completions},
     %w{Homebrew binary},
+    %w{Homebrew python},
   ]
 
   def query_regexp(query)