diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 839aa0297d..0385b6242a 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -12,10 +12,15 @@ if test -f version
 then
 	VN=$(cat version) || VN="$DEF_VER"
 elif test -d ${GIT_DIR:-.git} -o -f .git &&
-	VN=$(git describe --match "v[0-9]*" HEAD 2>/dev/null) &&
+	VN=$(git describe --match "v[0-9]*vfs*" HEAD 2>/dev/null) &&
 	case "$VN" in
 	*$LF*) (exit 1) ;;
 	v[0-9]*)
+		if test "${VN%%.vfs.*}" != "${DEF_VER%%.vfs.*}"
+		then
+			echo "Found version $VN, which is not based on $DEF_VER" >&2
+			exit 1
+		fi
 		git update-index -q --refresh
 		test -z "$(git diff-index --name-only HEAD --)" ||
 		VN="$VN-dirty" ;;