diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl
index 14876a114..12e7ab855 100755
--- a/tools/scripts/checkpatch.pl
+++ b/tools/scripts/checkpatch.pl
@@ -3011,6 +3011,13 @@ sub process {
 			}
 		}
 
+# OpenOCD specific: Begin: Extend list of checkpatch tests to ignore
+		if ($in_commit_log && $line =~ /^\s*Checkpatch-ignore:\s*(.*)/) {
+			my @array = split(/[\s,]+/, $1);
+			hash_save_array_words(\%ignore_type, \@array);
+		}
+# OpenOCD specific: End
+
 # Check for patch separator
 		if ($line =~ /^---$/) {
 			$has_patch_separator = 1;