diff --git a/components/engine/contrib/prepare-commit-msg.hook b/components/engine/contrib/prepare-commit-msg.hook
deleted file mode 100644
index c9389fb6d2..0000000000
--- a/components/engine/contrib/prepare-commit-msg.hook
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#       Auto sign all commits to allow them to be used by the Docker project.
-#       see https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work
-#
-GH_USER=$(git config --get github.user)
-SOB=$(git var GIT_AUTHOR_IDENT | sed -n "s/^\(.*>\).*$/Docker-DCO-1.1-Signed-off-by: \1 \(github: $GH_USER\)/p")
-grep -qs "^$SOB" "$1" || { 
-	echo 
-	echo "$SOB" 
-} >> "$1"
diff --git a/components/engine/hack/make/validate-dco b/components/engine/hack/make/validate-dco
index 8f3bfc317a..1c75d91bfa 100644
--- a/components/engine/hack/make/validate-dco
+++ b/components/engine/hack/make/validate-dco
@@ -13,8 +13,8 @@ notDocs="$(validate_diff --numstat | awk '$3 !~ /^docs\// { print $3 }')"
 githubUsernameRegex='[a-zA-Z0-9][a-zA-Z0-9-]+'
 
 # https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work
-dcoPrefix='Docker-DCO-1.1-Signed-off-by:'
-dcoRegex="^$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)> \\(github: ($githubUsernameRegex)\\)$"
+dcoPrefix='Signed-off-by:'
+dcoRegex="^(Docker-DCO-1.1-)?$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)>( \\(github: ($githubUsernameRegex)\\))?$"
 
 check_dco() {
 	grep -qE "$dcoRegex"