diff --git a/.github/workflows/windows_ci.yml b/.github/workflows/windows_ci.yml
index ef35263d6..cc768c96b 100644
--- a/.github/workflows/windows_ci.yml
+++ b/.github/workflows/windows_ci.yml
@@ -10,6 +10,20 @@ jobs:
         platform: [x64, Win32]
     steps:
     - uses: actions/checkout@v3
+    - name: Set environment variables
+      run: |
+        $gitrev = $(git describe --always)
+        $gitbranch = $(git branch --show-current)
+        $build_suffix = ("$gitbranch" -eq "master" -Or "$gitbranch" -eq "main") ? "-$gitrev" : "-$gitbranch-$gitrev"
+        $platform_alt = ("${{matrix.platform}}" -eq "x64") ? "win64" : "win32"
+        $platform_short = ("${{matrix.platform}}" -eq "Win32") ? "x86" : "${{matrix.platform}}"
+        $build_artifact = "ironwail${build_suffix}-${platform_alt}"
+        echo "BUILD_SUFFIX=$build_suffix" >> ${env:GITHUB_ENV}
+        echo "BUILD_ARTIFACT=$build_artifact" >> ${env:GITHUB_ENV}
+        echo "BUILD_DIR=Windows\VisualStudio\Build-ironwail\${platform_short}\Release" >> ${env:GITHUB_ENV}
+        echo "PLATFORM_ALT=$platform_alt" >> ${env:GITHUB_ENV}
+        echo "PLATFORM_SHORT=$platform_short" >> ${env:GITHUB_ENV}
+        echo "ForceImportBeforeCppTargets=${env:GITHUB_WORKSPACE}\Windows\VisualStudio\custom_build.props" >> ${env:GITHUB_ENV}
     - name: Build
       run: |
         $vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
@@ -17,8 +31,25 @@ jobs:
         $options = @( `
           '-property:Configuration=Release', `
           '-property:Platform=${{ matrix.platform }}', `
+          '-property:VER_SUFFIX=${env:BUILD_SUFFIX}', `
           '-maxcpucount', `
-          '-verbosity:minimal' `
+          '-verbosity:diagnostic' `
         )
         & $msbuild Windows\VisualStudio\ironwail.sln $options
         if (-not $?) { throw "Build failed" }
+    - name: Prepare archive
+      run: |
+            $zipdir = "artifact\${env:BUILD_ARTIFACT}"
+            mkdir $zipdir | out-null
+            copy ${env:BUILD_DIR}\*.exe $zipdir
+            copy ${env:BUILD_DIR}\*.dll $zipdir
+            copy Quake\ironwail.pak $zipdir
+            copy Quakespasm.html $zipdir
+            copy Quakespasm.txt $zipdir
+            copy Quakespasm-Music.txt $zipdir
+            copy LICENSE.txt $zipdir
+    - name: Upload archive
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ env.BUILD_ARTIFACT }}
+        path: artifact/*
diff --git a/Windows/VisualStudio/custom_build.props b/Windows/VisualStudio/custom_build.props
new file mode 100644
index 000000000..c8632be23
--- /dev/null
+++ b/Windows/VisualStudio/custom_build.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup Condition="'$(VER_SUFFIX)' != ''">
+    <ClCompile>
+      <AdditionalOptions>/DIRONWAIL_VER_SUFFIX=\&quot;$(VER_SUFFIX)\&quot; %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <PropertyGroup Condition="'$(BUILD_DIR)' != ''">
+    <OutDir>$(SolutionDir)$(BUILD_DIR)\</OutDir>
+    <IntDir>$(BUILD_DIR)\Out\</IntDir>
+  </PropertyGroup>
+</Project>