diff --git a/cpplint.py b/cpplint.py
index 6cb84adf3..330b926d0 100755
--- a/cpplint.py
+++ b/cpplint.py
@@ -1192,14 +1192,14 @@ def Error(filename, linenum, category, confidence, message):
   if _ShouldPrintError(category, confidence, linenum):
     _cpplint_state.IncrementErrorCount(category)
     if _cpplint_state.output_format == 'vs7':
-      sys.stderr.write('%s(%s):  %s  [%s] [%d]\n' % (
-          filename, linenum, message, category, confidence))
+      sys.stderr.write('%s(%s): (cpplint)  %s  [%s] [%d]\n' %
+                       (filename, linenum, message, category, confidence))
     elif _cpplint_state.output_format == 'eclipse':
-      sys.stderr.write('%s:%s: warning: %s  [%s] [%d]\n' % (
-          filename, linenum, message, category, confidence))
+      sys.stderr.write('%s:%s: (cpplint) warning: %s  [%s] [%d]\n' %
+                       (filename, linenum, message, category, confidence))
     else:
-      sys.stderr.write('%s:%s:  %s  [%s] [%d]\n' % (
-          filename, linenum, message, category, confidence))
+      sys.stderr.write('%s:%s:  (cpplint) %s  [%s] [%d]\n' %
+                       (filename, linenum, message, category, confidence))
 
 
 # Matches standard C++ escape sequences per 2.13.2.3 of the C++ standard.
diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py
index 39675fbda..d3b8d4182 100644
--- a/presubmit_canned_checks.py
+++ b/presubmit_canned_checks.py
@@ -267,7 +267,10 @@ def CheckChangeLintsClean(input_api, output_api, source_file_filter=None,
       res_type = output_api.PresubmitError
     else:
       res_type = output_api.PresubmitPromptWarning
-    result = [res_type('Changelist failed cpplint.py check.')]
+    result = [
+        res_type('Changelist failed cpplint.py check. '
+                 'Search the output for "(cpplint)"')
+    ]
 
   return result