diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 8035bc395a2109f6240722d1ddefba84cafa4e6e..774e46f96f884ee77679bc55c2770d5194317d96 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-12  Tom de Vries  <tom@codesourcery.com>
+
+	* check_GNU_style.sh: Don't use a filename prefix if we're only
+	processing one patch file.
+
 2015-05-12  Yury Gribov  <y.gribov@samsung.com>
 
 	* mklog: Ignore preprocessor directives.
diff --git a/contrib/check_GNU_style.sh b/contrib/check_GNU_style.sh
index e8d5dcaf7bc15a89d866f027e7145f2e920f6aed..eeff48f8c4c3bdbf4560c0b4b82419011a87badd 100755
--- a/contrib/check_GNU_style.sh
+++ b/contrib/check_GNU_style.sh
@@ -36,6 +36,8 @@ EOF
 }
 
 test $# -eq 0 && usage
+nfiles=$#
+files="$*"
 
 inp=check_GNU_style.inp
 tmp=check_GNU_style.tmp
@@ -44,9 +46,15 @@ tmp=check_GNU_style.tmp
 trap "rm -f $inp $tmp" 0
 trap "rm -f $inp $tmp ; exit 1" 1 2 3 5 9 13 15
 
-grep -nH '^+' $* \
-	| grep -v ':+++' \
-	> $inp
+if [ $nfiles -eq 1 ]; then
+    # There's no need for the file prefix if we're dealing only with one file.
+    format="-n"
+else
+    format="-nH"
+fi
+grep $format '^+' $files \
+    | grep -v ':+++' \
+    > $inp
 
 # Grep
 g (){