diff --git a/Library/Homebrew/blacklist.rb b/Library/Homebrew/blacklist.rb
index 33758eccc6de6e575765ab47f4000d4704dc05c4..d9f2dceb1cfbc8472223714290658bd91e08b519 100644
--- a/Library/Homebrew/blacklist.rb
+++ b/Library/Homebrew/blacklist.rb
@@ -6,6 +6,11 @@ def blacklisted? name
   when 'libarchive', 'libpcap' then <<-EOS.undent
     Apple distributes #{name} with OS X, you can find it in /usr/lib.
     EOS
+  when 'libiconv' then <<-EOS.undent
+    Apple distributes #{name} with OS X, you can find it in /usr/lib.
+    Some build scripts fail to detect it correctly, please check existing
+    formulae for solutions.
+    EOS
   when 'libxml', 'libxlst' then <<-EOS.undent
     Apple distributes #{name} with OS X, you can find it in /usr/lib.
     However not all build scripts look for these hard enough, so you may need
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 5e6b982c3081cec4ea8c851f9b52840f3c3a7548..808b2db8195b55b8b51a6e49d13fa62079235f57 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -340,7 +340,7 @@ def check_xcode_prefix
   if prefix.to_s.match(' ')
     <<-EOS.undent
       Xcode is installed to a directory with a space in the name.
-      This will cause some formulae, such as libiconv, to fail to build.
+      This will cause some formulae to fail to build.
     EOS
   end
 end