diff --git a/.github/workflows/package-windows.yml b/.github/workflows/package-windows.yml
index 7e2c6eea1..f206208c6 100644
--- a/.github/workflows/package-windows.yml
+++ b/.github/workflows/package-windows.yml
@@ -38,8 +38,7 @@ jobs:
       run: |
         & .\scripts\package\win-setup.ps1 -DiscidVersion $Env:DISCID_VERSION -FpcalVersion $Env:FPCALC_VERSION
         Write-Output "::add-path::C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64"
-        # Write-Output "::set-env name=BUILD_NUMBER::$(git rev-list --count HEAD)"
-        Write-Output "::set-env name=BUILD_NUMBER::0"
+        Write-Output "::set-env name=BUILD_NUMBER::$(git rev-list --count HEAD)"
         New-Item -Name .\artifacts -ItemType Directory
       env:
         DISCID_VERSION: 0.6.2
diff --git a/setup.py b/setup.py
index 9cdc54ffa..b7449bda9 100644
--- a/setup.py
+++ b/setup.py
@@ -245,12 +245,13 @@ class picard_build(build):
             generate_file('win-version-info.txt.in', 'win-version-info.txt', {**args, **version_args})
 
             default_publisher = 'CN=Metabrainz Foundation Inc., O=Metabrainz Foundation Inc., L=San Luis Obispo, S=California, C=US'
+            store_version = (PICARD_VERSION.major, PICARD_VERSION.minor, PICARD_VERSION.patch * 100000 + self.build_number, 0)
             generate_file('appxmanifest.xml.in', 'appxmanifest.xml', {
                 'app-id': "MetaBrainzFoundationInc." + PICARD_APP_ID,
                 'display-name': PICARD_APP_NAME,  # PICARD_DISPLAY_NAME, messed up name reservation.
                 'short-name': PICARD_APP_NAME,
                 'publisher': os.environ.get('PICARD_APPX_PUBLISHER', default_publisher),
-                'version': file_version_str,
+                'version': '.'.join([str(v) for v in store_version]),
             })
         elif sys.platform == 'linux':
             self.run_command('build_appdata')