diff --git a/.checkpatch.conf b/.checkpatch.conf
index 928028003..1ab743e2c 100644
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -27,6 +27,3 @@
 --ignore SWITCH_CASE_INDENT_LEVEL
 --ignore TRACING_LOGGING
 --ignore VOLATILE
-
-# Temporarily lines, to commit checkpatch itself. To be removed!
---ignore TYPO_SPELLING
diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl
index 07dca63db..6f877c379 100755
--- a/tools/scripts/checkpatch.pl
+++ b/tools/scripts/checkpatch.pl
@@ -3398,6 +3398,9 @@ sub process {
 
 # Check for various typo / spelling mistakes
 		if (defined($misspellings) &&
+		    # OpenOCD specific: Begin: don't check spelling on spelling_file
+		    index($spelling_file, $realfile) + length($realfile) != length($spelling_file) &&
+		    # OpenOCD specific: End
 		    ($in_commit_log || $line =~ /^(?:\+|Subject:)/i)) {
 			while ($rawline =~ /(?:^|[^\w\-'`])($misspellings)(?:[^\w\-'`]|$)/gi) {
 				my $typo = $1;