diff --git a/hack/generate-versioninfo.sh b/hack/generate-versioninfo.sh
index ed66dff54e..3040dd3e3c 100755
--- a/hack/generate-versioninfo.sh
+++ b/hack/generate-versioninfo.sh
@@ -5,7 +5,7 @@ source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 # Generates the .syso file used to add compile-time VERSIONINFO metadata to the
 # Windows binary.
 function os::build::generate_windows_versioninfo() {
-  if [[ "${SOURCE_GIT_TAG}" =~ ^[a-z-]*([0-9]+)\.([0-9]+)\.([0-9]+).* ]] ; then
+  if [[ "${SOURCE_GIT_TAG}" =~ ^openshift-clients-([0-9]+)\.([0-9]+)\.([0-9]+) ]] ; then
     local major=${BASH_REMATCH[1]}
     local minor=${BASH_REMATCH[2]}
     local patch=${BASH_REMATCH[3]}
diff --git a/vendor/github.com/openshift/build-machinery-go/make/lib/golang.mk b/vendor/github.com/openshift/build-machinery-go/make/lib/golang.mk
index d08f74a42d..ca2c1a71f0 100644
--- a/vendor/github.com/openshift/build-machinery-go/make/lib/golang.mk
+++ b/vendor/github.com/openshift/build-machinery-go/make/lib/golang.mk
@@ -50,7 +50,7 @@ GO_TEST_FLAGS ?=-race
 
 GO_LD_EXTRAFLAGS ?=
 
-SOURCE_GIT_TAG ?=$(shell git describe --long --tags --abbrev=7 --match 'v[0-9]*' || echo 'v0.0.0-unknown-$(SOURCE_GIT_COMMIT)')
+SOURCE_GIT_TAG ?=$(shell git describe --long --tags --abbrev=7 --match 'openshift-clients-*' | sed 's/openshift-clients-/v/g' || echo 'v0.0.0-unknown-$(SOURCE_GIT_COMMIT)')
 SOURCE_GIT_COMMIT ?=$(shell git rev-parse --short "HEAD^{commit}" 2>/dev/null)
 SOURCE_GIT_TREE_STATE ?=$(shell ( ( [ ! -d ".git/" ] || git diff --quiet ) && echo 'clean' ) || echo 'dirty')