diff --git a/src/main/scripts/cdpd-patcher b/src/main/scripts/cdpd-patcher
index b171d21..d297629 100755
--- a/src/main/scripts/cdpd-patcher
+++ b/src/main/scripts/cdpd-patcher
@@ -10,6 +10,7 @@ trap "unlink $tmp" EXIT
 
 COMPONENT="${1}"
 VERSION="$2"
+[ "$VERSION" == "AUTO" ] && VERSION=
 VERSION="${VERSION:-$GERRIT_BRANCH}"
 VERSION="${VERSION:-cdpd-master}"
 UNPATCHER=off