diff --git a/util/gitconfig/commit-msg b/util/gitconfig/commit-msg
index 82f0581ced..2eef752156 100755
--- a/util/gitconfig/commit-msg
+++ b/util/gitconfig/commit-msg
@@ -169,5 +169,8 @@ _gen_ChangeId() {
 	git hash-object -t commit --stdin
 }
 
-
+if ! grep -qi '^[[:space:]]*\+Signed-off-by:' "$MSG"; then
+	printf "\nError: No Signed-off-by line in the commit message.\n"
+	exit 1
+fi
 add_ChangeId
diff --git a/util/lint/lint-stable-020-signed-off-by b/util/lint/lint-extended-020-signed-off-by
similarity index 100%
rename from util/lint/lint-stable-020-signed-off-by
rename to util/lint/lint-extended-020-signed-off-by