diff --git a/.checkpatch.conf b/.checkpatch.conf
index 4f2c931ca..0aad4c5b4 100644
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -30,5 +30,4 @@
 
 # Temporarily lines, to commit checkpatch itself. To be removed!
 --no-tree
---ignore BAD_SIGN_OFF
 --ignore TYPO_SPELLING
diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl
index 1daedd2f2..762e9ed82 100755
--- a/tools/scripts/checkpatch.pl
+++ b/tools/scripts/checkpatch.pl
@@ -1403,6 +1403,10 @@ sub parse_email {
 			$address = "";
 			$comment = "";
 		}
+	# OpenOCD specific: Begin: handle jenkins as valid email
+	} elsif ($formatted_email eq "jenkins") {
+			$address = "jenkins";
+	# OpenOCD specific: End
 	}
 
 	# Extract comments from names excluding quoted parts