diff --git a/Library/Homebrew/dev-cmd/cat.rb b/Library/Homebrew/dev-cmd/cat.rb
index ff0e429a46..0a10a5f41d 100644
--- a/Library/Homebrew/dev-cmd/cat.rb
+++ b/Library/Homebrew/dev-cmd/cat.rb
@@ -54,7 +54,7 @@ module Homebrew
 
     if Homebrew.failed?
       $stderr.puts "The name may be wrong, or the tap hasn't been tapped."
-      $stderr.puts "Consider using `brew info --github formula|cask [...]` instead."
+      $stderr.puts "Consider using `brew info --github #{args.named.join(" ")}` instead."
       return
     end
 
diff --git a/Library/Homebrew/test/dev-cmd/cat_spec.rb b/Library/Homebrew/test/dev-cmd/cat_spec.rb
index 6a5d6a6d79..3d2fce9791 100644
--- a/Library/Homebrew/test/dev-cmd/cat_spec.rb
+++ b/Library/Homebrew/test/dev-cmd/cat_spec.rb
@@ -15,4 +15,13 @@ describe "brew cat" do
       .and not_to_output.to_stderr
       .and be_a_success
   end
+
+  describe "when a source file isn't found" do
+    it "prints a suggestion to use brew info --github" , :integration_test do
+
+      expect  { brew "cat", "asdf", "bogus"}
+        .to output(/Consider using `brew info --github asdf bogus` instead/).to_stderr
+        .and be_a_failure
+    end
+  end
 end