diff --git a/dist/win/.gitignore b/dist/win/.gitignore
index 9cce929df..32316fd59 100644
--- a/dist/win/.gitignore
+++ b/dist/win/.gitignore
@@ -4,4 +4,6 @@ installer
 *.wixobj
 *.pdb
 *.msi
+*.exe
+*.jmod
 license.rtf
\ No newline at end of file
diff --git a/dist/win/build.ps1 b/dist/win/build.ps1
index c630fffdd..a51304fbe 100644
--- a/dist/win/build.ps1
+++ b/dist/win/build.ps1
@@ -171,10 +171,15 @@ $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources"
  "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges"
 
 # download Winfsp
-$winfspMsiUrl= (Select-String -Path ".\bundle\resources\winFspMetaData.wxi" -Pattern '<\?define BundledWinFspDownloadLink="(.+)".*?>').Matches.Groups[1].Value
+$winfspMsiUrl= (Select-String -Path ".\bundle\resources\winfsp.url" -Pattern 'URL=(https://.+)$').Matches.Groups[1].Value
 Write-Output "Downloading ${winfspMsiUrl}..."
 Invoke-WebRequest $winfspMsiUrl -OutFile ".\bundle\resources\winfsp.msi" # redirects are followed by default
 
+# download legacy-winfsp uninstaller
+$winfspUninstaller= (Select-String -Path ".\bundle\resources\winfsp-uninstaller.url" -Pattern 'URL=(https://.+)$').Matches.Groups[1].Value
+Write-Output "Downloading ${winfspUninstaller}..."
+Invoke-WebRequest $winfspUninstaller -OutFile ".\bundle\resources\winfsp-uninstaller.exe" # redirects are followed by default
+
 # copy MSI to bundle resources
 Copy-Item ".\installer\$AppName-*.msi" -Destination ".\bundle\resources\$AppName.msi"
 
diff --git a/dist/win/bundle/resources/winFspMetaData.wxi b/dist/win/bundle/resources/winFspMetaData.wxi
deleted file mode 100644
index 53e0400e5..000000000
--- a/dist/win/bundle/resources/winFspMetaData.wxi
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <!-- A version number MUST be prefixed with letter "v", otherwise it is considered a normal string -->
-  <?define BundledWinFspVersion="v1.12.22339" ?>
-  <?define BundledWinFspDownloadLink="https://github.com/winfsp/winfsp/releases/download/v1.12.22339/winfsp-1.12.22339.msi" ?> <!-- Only used by external build scripts -->
-</Include>
\ No newline at end of file
diff --git a/dist/win/bundle/resources/winfsp-uninstaller.url b/dist/win/bundle/resources/winfsp-uninstaller.url
new file mode 100644
index 000000000..93d6d3697
--- /dev/null
+++ b/dist/win/bundle/resources/winfsp-uninstaller.url
@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=https://github.com/cryptomator/winfsp-uninstaller/releases/download/1.0.0-beta3/winfsp-uninstaller.exe
\ No newline at end of file
diff --git a/dist/win/bundle/resources/winfsp.url b/dist/win/bundle/resources/winfsp.url
new file mode 100644
index 000000000..99b3e93b6
--- /dev/null
+++ b/dist/win/bundle/resources/winfsp.url
@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi
\ No newline at end of file
diff --git a/dist/win/bundle/resources/winfsp1ExeUninstaller.exe b/dist/win/bundle/resources/winfsp1ExeUninstaller.exe
deleted file mode 100644
index 00ce2fdb6..000000000
Binary files a/dist/win/bundle/resources/winfsp1ExeUninstaller.exe and /dev/null differ