diff --git a/tools/checkpatch.sh b/tools/checkpatch.sh
index 5ba15d817f1..5e08b2abd70 100755
--- a/tools/checkpatch.sh
+++ b/tools/checkpatch.sh
@@ -90,7 +90,18 @@ check_patch() {
   fi
 }
 
+check_msg() {
+  while read; do
+    if [[ $REPLY =~  ^Change-Id ]]; then
+      echo "Remove Gerrit Change-ID's before submitting upstream"
+      fail=1
+    fi
+  done
+}
+
 check_commit() {
+  msg=`git show -s --format=%B $1`
+  check_msg <<< "$msg"
   diffs=`git diff $1`
   check_ranges <<< "$diffs"
 }