diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d0d13bb..81b3092 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,6 +23,8 @@ jobs:
     name: Build and verify Windows release
     runs-on: windows-latest
     timeout-minutes: 45
+    outputs:
+      tag: ${{ steps.version.outputs.tag }}
     permissions:
       contents: write
       # Build provenance attestations for the published files.
@@ -43,6 +45,7 @@ jobs:
         uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
 
       - name: Prepare and validate release version and changelog
+        id: version
         env:
           REQUESTED_VERSION: ${{ inputs.version }}
         run: |
@@ -64,6 +67,7 @@ jobs:
           $releaseVersion = cargo xtask version
           if ($LASTEXITCODE -ne 0) { throw 'Cannot determine release version.' }
           "RELEASE_TAG=v$releaseVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          "tag=v$releaseVersion" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
           cargo xtask release-notes --output "$env:RUNNER_TEMP/release-notes.md"
           if ($LASTEXITCODE -ne 0) { throw 'Release changelog is missing or empty.' }
 
@@ -133,3 +137,45 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: cargo xtask publish --package dist --tag $env:RELEASE_TAG
+
+  # A separate job keeps the winget token out of the job that holds write
+  # access to this repository. Prereleases are not submitted.
+  winget:
+    name: Submit stable release to winget
+    needs: release
+    if: ${{ !contains(needs.release.outputs.tag, '-') }}
+    runs-on: windows-latest
+    timeout-minutes: 15
+    permissions:
+      contents: read
+    env:
+      RELEASE_TAG: ${{ needs.release.outputs.tag }}
+      HAS_WINGET_TOKEN: ${{ secrets.WINGET_TOKEN != '' }}
+      KOMAC_VERSION: 2.17.1
+      KOMAC_SHA256: A97C002C5FFA15F232AF117EFAC6774E755D27ACC47EBA00F1661033267D7438
+
+    steps:
+      - name: Skip without a winget token
+        if: env.HAS_WINGET_TOKEN != 'true'
+        run: echo "::notice::WINGET_TOKEN is not set, so $env:RELEASE_TAG was not submitted to winget."
+
+      - name: Install pinned Komac
+        if: env.HAS_WINGET_TOKEN == 'true'
+        run: |
+          $komac = Join-Path $env:RUNNER_TEMP 'komac.exe'
+          Invoke-WebRequest "https://github.com/russellbanks/Komac/releases/download/v$env:KOMAC_VERSION/komac-$env:KOMAC_VERSION-x86_64-pc-windows-msvc.exe" -OutFile $komac
+          if ((Get-FileHash $komac -Algorithm SHA256).Hash -ne $env:KOMAC_SHA256) { throw 'Komac checksum mismatch.' }
+
+      - name: Open winget-pkgs pull request
+        if: env.HAS_WINGET_TOKEN == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.WINGET_TOKEN }}
+        run: |
+          $version = $env:RELEASE_TAG.Substring(1)
+          $release = "$env:GITHUB_SERVER_URL/$env:GITHUB_REPOSITORY/releases"
+          & (Join-Path $env:RUNNER_TEMP 'komac.exe') update SubhransuDe.ControlFreak `
+            --version $version `
+            --urls "$release/download/$env:RELEASE_TAG/ControlFreak-$version.exe" `
+            --release-notes-url "$release/tag/$env:RELEASE_TAG" `
+            --submit
+          if ($LASTEXITCODE -ne 0) { throw 'Komac could not submit the winget update.' }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23e410a..68e91e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ versioned section and uses that section for the corresponding GitHub Release not
 
 ## Unreleased
 
+### Changed
+
+- Apps & Features and `winget list` now show the app as `ControlFreak` instead of `ControlFreak version <version>`. The version stays in its own column.
+
 ### Fixed
 
 - GitHub release notes no longer break each changelog entry mid-sentence. Wrapped entries are joined into single lines when the notes are generated.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c37cfa9..0df3b0e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -126,9 +126,11 @@ the setup helper, and the release preparation commands remain developer-only.
 After the tests and package checks pass, the workflow commits those three files and pushes `main`
 and the version tag atomically. If `main` advances during the build, the push fails without adding
 a tag; run again from the updated `main`. Repository rules must permit the workflow token to push
-this release commit. No personal access token is required. The same workflow then publishes the
+this release commit. Publishing needs no personal access token. The same workflow then publishes the
 installer, ZIP, checksums and the version's changelog notes. Alpha/beta/RC versions are prereleases.
 
+After a stable release is published, a separate job uses a pinned, checksum-verified Komac to open a pull request in [microsoft/winget-pkgs](https://github.com/microsoft/winget-pkgs) for `SubhransuDe.ControlFreak`. It needs a `WINGET_TOKEN` repository secret: a classic personal access token with the `public_repo` and `workflow` scopes, whose owner has a fork of winget-pkgs. Without the secret the job only records a notice, and prereleases are never submitted. If only this job fails, use **Re-run failed jobs** on the same workflow run.
+
 Manual tag pushes remain supported for versions whose manifest and dated changelog section have
 already been prepared. If publication fails after the tag was pushed, dispatch **Release** against
 that existing tag with its matching version using
diff --git a/packaging/windows/controlfreak.iss b/packaging/windows/controlfreak.iss
index b4ec208..c2639f4 100644
--- a/packaging/windows/controlfreak.iss
+++ b/packaging/windows/controlfreak.iss
@@ -45,6 +45,7 @@ WizardSizePercent=120,130
 SetupMutex={#Identity}.Setup
 CloseApplications=no
 RestartApplications=no
+UninstallDisplayName=ControlFreak
 UninstallDisplayIcon={app}\controlfreak.exe
 OutputDir={#OutputPath}
 OutputBaseFilename=ControlFreak-{#Version}