diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index a529f74029..44df500931 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -53,7 +53,8 @@ end
 # http://sourceforge.net/projects/macgpg2/files/
 def check_for_macgpg2
   if File.exist? "/Applications/start-gpg-agent.app" or
-     File.exist? "/Library/Receipts/libiconv1.pkg"
+     File.exist? "/Library/Receipts/libiconv1.pkg" or
+     File.exist? "/usr/local/MacGPG2"
     <<-EOS.undent
       You may have installed MacGPG2 via the package installer.
       Several other checks in this script will turn up problems, such as stray