diff --git a/.checkpatch.conf b/.checkpatch.conf
index 0aad4c5b4..928028003 100644
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -29,5 +29,4 @@
 --ignore VOLATILE
 
 # Temporarily lines, to commit checkpatch itself. To be removed!
---no-tree
 --ignore TYPO_SPELLING
diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl
index aa3e63743..07dca63db 100755
--- a/tools/scripts/checkpatch.pl
+++ b/tools/scripts/checkpatch.pl
@@ -97,7 +97,7 @@ Version: $V
 Options:
   -q, --quiet                quiet
   -v, --verbose              verbose mode
-  --no-tree                  run without a kernel tree
+  --no-tree                  run without an OpenOCD tree
   --no-signoff               do not check for 'Signed-off-by' line
   --patch                    treat FILE as patchfile (default)
   --emacs                    emacs compile window format
@@ -124,7 +124,7 @@ Options:
                              requires --strict for use with --file
   --min-conf-desc-length=n   set the min description length, if shorter, warn
   --tab-size=n               set the number of spaces for tab (default $tabsize)
-  --root=PATH                PATH to the kernel tree root
+  --root=PATH                PATH to the OpenOCD tree root
   --no-summary               suppress the per-file summary
   --mailback                 only produce a report in case of warnings/errors
   --summary-file             include the filename in summary
@@ -461,14 +461,16 @@ if ($tree) {
 	} else {
 		if (top_of_kernel_tree('.')) {
 			$root = '.';
-		} elsif ($0 =~ m@(.*)/scripts/[^/]*$@ &&
+		# OpenOCD specific: Begin: replace s"/scripts/"/tools/scripts/"
+		} elsif ($0 =~ m@(.*)/tools/scripts/[^/]*$@ &&
 						top_of_kernel_tree($1)) {
 			$root = $1;
 		}
+		# OpenOCD specific: End
 	}
 
 	if (!defined $root) {
-		print "Must be run from the top-level dir. of a kernel tree\n";
+		print "Must be run from the top-level dir. of an OpenOCD tree\n";
 		exit(2);
 	}
 }
@@ -1365,11 +1367,19 @@ exit($exit);
 sub top_of_kernel_tree {
 	my ($root) = @_;
 
+	if (!$OpenOCD) {
 	my @tree_check = (
 		"COPYING", "CREDITS", "Kbuild", "MAINTAINERS", "Makefile",
 		"README", "Documentation", "arch", "include", "drivers",
 		"fs", "init", "ipc", "kernel", "lib", "scripts",
 	);
+	} # !$OpenOCD
+	# OpenOCD specific: Begin
+	my @tree_check = (
+		"AUTHORS", "BUGS", "COPYING", "HACKING", "Makefile.am",
+		"README", "contrib", "doc", "src", "tcl", "testing", "tools",
+	);
+	# OpenOCD specific: End
 
 	foreach my $check (@tree_check) {
 		if (! -e $root . '/' . $check) {