diff --git a/tools/build-choco.bat b/tools/build-choco.bat
index 58f504db..439317d1 100755
--- a/tools/build-choco.bat
+++ b/tools/build-choco.bat
@@ -105,13 +105,10 @@ if X%SignedPackage%==X (
 
 :choco
 if not exist "build\%Configuration%\%MyProductFileName%-*.msi" (echo installer msi not found >&2 & exit /b 1)
+if not X!MyProductName!==XWinFsp (echo skipping choco build for !MyProductName! >&2 & exit /b 0)
 set Version=
 for %%f in (build\%Configuration%\%MyProductFileName%-*.msi) do set Version=%%~nf
 set Version=!Version:%MyProductFileName%-=!
-set ProductStage=
-for /f "delims=<> tokens=3" %%i in ('findstr "<MyProductStage>" version.properties') do (
-    set MyProductStage=%%i
-)
 set PackageVersion=!Version!
 if not X!MyProductStage!==XGold (
     set PackageVersion=!Version!-pre
diff --git a/tools/build.bat b/tools/build.bat
index 58f504db..439317d1 100755
--- a/tools/build.bat
+++ b/tools/build.bat
@@ -105,13 +105,10 @@ if X%SignedPackage%==X (
 
 :choco
 if not exist "build\%Configuration%\%MyProductFileName%-*.msi" (echo installer msi not found >&2 & exit /b 1)
+if not X!MyProductName!==XWinFsp (echo skipping choco build for !MyProductName! >&2 & exit /b 0)
 set Version=
 for %%f in (build\%Configuration%\%MyProductFileName%-*.msi) do set Version=%%~nf
 set Version=!Version:%MyProductFileName%-=!
-set ProductStage=
-for /f "delims=<> tokens=3" %%i in ('findstr "<MyProductStage>" version.properties') do (
-    set MyProductStage=%%i
-)
 set PackageVersion=!Version!
 if not X!MyProductStage!==XGold (
     set PackageVersion=!Version!-pre
diff --git a/tools/myinfo.bat b/tools/myinfo.bat
index 88234e3f..b66a7735 100644
--- a/tools/myinfo.bat
+++ b/tools/myinfo.bat
@@ -10,6 +10,10 @@ for /F "tokens=2,3,4 delims=<>" %%a in (%~dp0..\build\VStudio\version.properties
             set MyDescription=%%b
         ) else if "%%a"=="MyCompanyName" (
             set MyCompanyName=%%b
+        ) else if "%%a"=="MyProductVersion" (
+            set MyProductVersion=%%b
+        ) else if "%%a"=="MyProductStage" (
+            set MyProductStage=%%b
         )
     )
 )
@@ -18,3 +22,5 @@ echo MyProductName=%MyProductName%
 echo MyProductFileName=%MyProductFileName%
 echo MyDescription=%MyDescription%
 echo MyCompanyName=%MyCompanyName%
+echo MyProductVersion=%MyProductVersion%
+echo MyProductStage=%MyProductStage%