diff --git a/.gitmodules b/.gitmodules
index b0fa098..2f4429a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "SabreTools"]
 	path = SabreTools
 	url = https://github.com/SabreTools/SabreTools
-[submodule "winfsp"]
-	path = winfsp
-	url = https://github.com/billziss-gh/winfsp/
diff --git a/RomRepoMgr.Core/RomRepoMgr.Core.csproj b/RomRepoMgr.Core/RomRepoMgr.Core.csproj
index ab3b815..355185e 100644
--- a/RomRepoMgr.Core/RomRepoMgr.Core.csproj
+++ b/RomRepoMgr.Core/RomRepoMgr.Core.csproj
@@ -12,13 +12,13 @@
     <PackageReference Include="Mono.Fuse.NETStandard" Version="1.1.0"/>
     <PackageReference Include="SharpCompress" Version="0.38.0" />
     <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0"/>
+    <PackageReference Include="winfsp.net" Version="2.1.24255" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\RomRepoMgr.Database\RomRepoMgr.Database.csproj"/>
     <ProjectReference Include="..\RomRepoMgr.Settings\RomRepoMgr.Settings.csproj"/>
     <ProjectReference Include="..\SabreTools\SabreTools.DatFiles\SabreTools.DatFiles.csproj"/>
-    <ProjectReference Include="..\winfsp-netcore\winfsp-netcore.csproj"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/RomRepoMgr.sln b/RomRepoMgr.sln
index c53ac64..838d60d 100644
--- a/RomRepoMgr.sln
+++ b/RomRepoMgr.sln
@@ -8,8 +8,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RomRepoMgr.Settings", "RomR
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RomRepoMgr.Core", "RomRepoMgr.Core\RomRepoMgr.Core.csproj", "{1C7E7286-1BA6-43B0-A042-4A3C378BDDC1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winfsp-netcore", "winfsp-netcore\winfsp-netcore.csproj", "{4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.DatFiles", "SabreTools\SabreTools.DatFiles\SabreTools.DatFiles.csproj", "{2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Core", "SabreTools\SabreTools.Core\SabreTools.Core.csproj", "{77E643AF-F6A9-45CE-B76D-0C1A4533A13E}"
@@ -46,10 +44,6 @@ Global
 		{1C7E7286-1BA6-43B0-A042-4A3C378BDDC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1C7E7286-1BA6-43B0-A042-4A3C378BDDC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C7E7286-1BA6-43B0-A042-4A3C378BDDC1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/winfsp b/winfsp
deleted file mode 160000
index af52ac3..0000000
--- a/winfsp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit af52ac3df0926c5772f7ed0cda9447dfa7eebe32
diff --git a/winfsp-netcore/winfsp-netcore.csproj b/winfsp-netcore/winfsp-netcore.csproj
deleted file mode 100644
index f2e7e4c..0000000
--- a/winfsp-netcore/winfsp-netcore.csproj
+++ /dev/null
@@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
-        <RootNamespace>winfsp_netcore</RootNamespace>
-    </PropertyGroup>
-    
-    <PropertyGroup>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    </PropertyGroup>
-    
-    <ItemGroup>
-      <Compile Include="..\winfsp\src\dotnet\FileSystemBase+Const.cs">
-        <Link>FileSystemBase+Const.cs</Link>
-      </Compile>
-      <Compile Include="..\winfsp\src\dotnet\FileSystemBase.cs">
-        <Link>FileSystemBase.cs</Link>
-      </Compile>
-      <Compile Include="..\winfsp\src\dotnet\FileSystemHost.cs">
-        <Link>FileSystemHost.cs</Link>
-      </Compile>
-      <Compile Include="..\winfsp\src\dotnet\Interop.cs">
-        <Link>Interop.cs</Link>
-      </Compile>
-      <Compile Include="..\winfsp\src\dotnet\Service.cs">
-        <Link>Service.cs</Link>
-      </Compile>
-    </ItemGroup>
-    
-    <ItemGroup>
-      <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-      <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
-    </ItemGroup>
-</Project>