diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 914e45a63731ee40c2fcefbc748acd20fbaf69ba..39339529b99b9662169f7484099a9bd0253326a3 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -290,8 +290,8 @@ sub process {
 		}
 
 #make up the handle for any error we report on this line
-		$here = "PATCH: $ARGV:$linenr:";
-		$here .= "\nFILE: $realfile:$realline:" if ($realcnt != 0);
+		$here = "#$linenr: ";
+		$here .= "FILE: $realfile:$realline:" if ($realcnt != 0);
 
 		my $herecurr = "$here\n$line\n\n";
 		my $hereprev = "$here\n$prevline\n$line\n\n";