diff --git a/.gitmodules b/.gitmodules
index e2332b5f2..b0e822703 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "CICMMetadata"]
 	path = CICMMetadata
 	url = https://github.com/claunia/CICMMetadata
-[submodule "Claunia.RsrcFork"]
-	path = Claunia.RsrcFork
-	url = https://github.com/claunia/Claunia.RsrcFork
diff --git a/Claunia.RsrcFork b/Claunia.RsrcFork
deleted file mode 160000
index 88e23b83d..000000000
--- a/Claunia.RsrcFork
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 88e23b83d069a097ef8f61afc6f93402b0564edc
diff --git a/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj b/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj
index 91970d75d..06ad419c2 100644
--- a/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj
+++ b/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj
@@ -38,6 +38,10 @@
     <Reference Include="SharpCompress">
       <HintPath>..\packages\SharpCompress.0.15.2\lib\net40\SharpCompress.dll</HintPath>
     </Reference>
+    <Reference Include="Claunia.RsrcFork">
+      <HintPath>..\packages\Claunia.RsrcFork.1.0.0\lib\net40\Claunia.RsrcFork.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -96,10 +100,6 @@
       <Project>{0BEB3088-B634-4289-AE17-CDF2D25D00D5}</Project>
       <Name>DiscImageChef.Decoders</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Claunia.RsrcFork\Claunia.RsrcFork\Claunia.RsrcFork.csproj">
-      <Project>{CA231ED3-0C78-496C-AAFE-D085F6E9BEC6}</Project>
-      <Name>Claunia.RsrcFork</Name>
-    </ProjectReference>
     <ProjectReference Include="..\DiscImageChef.Filters\DiscImageChef.Filters.csproj">
       <Project>{D571B8EF-903D-4353-BDD5-B834F9F029EF}</Project>
       <Name>DiscImageChef.Filters</Name>
diff --git a/DiscImageChef.DiscImages/packages.config b/DiscImageChef.DiscImages/packages.config
index 2f8fbd0e8..d0b36c90f 100644
--- a/DiscImageChef.DiscImages/packages.config
+++ b/DiscImageChef.DiscImages/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Claunia.RsrcFork" version="1.0.0" targetFramework="net40" />
   <package id="plist-cil" version="1.16.0" targetFramework="net40" />
   <package id="SharpCompress" version="0.15.2" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/DiscImageChef.sln b/DiscImageChef.sln
index d9cdcea9f..925034b32 100644
--- a/DiscImageChef.sln
+++ b/DiscImageChef.sln
@@ -27,8 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Metadata", "D
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Settings", "DiscImageChef.Settings\DiscImageChef.Settings.csproj", "{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Claunia.RsrcFork", "Claunia.RsrcFork\Claunia.RsrcFork\Claunia.RsrcFork.csproj", "{CA231ED3-0C78-496C-AAFE-D085F6E9BEC6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Filters", "DiscImageChef.Filters\DiscImageChef.Filters.csproj", "{D571B8EF-903D-4353-BDD5-B834F9F029EF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Core", "DiscImageChef.Core\DiscImageChef.Core.csproj", "{679659B8-25D0-4279-B632-56EF8F94ADC0}"
@@ -93,10 +91,6 @@ Global
 		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Debug|x86.Build.0 = Debug|Any CPU
 		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Release|x86.ActiveCfg = Release|Any CPU
 		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Release|x86.Build.0 = Release|Any CPU
-		{CA231ED3-0C78-496C-AAFE-D085F6E9BEC6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CA231ED3-0C78-496C-AAFE-D085F6E9BEC6}.Debug|x86.Build.0 = Debug|Any CPU
-		{CA231ED3-0C78-496C-AAFE-D085F6E9BEC6}.Release|x86.ActiveCfg = Release|Any CPU
-		{CA231ED3-0C78-496C-AAFE-D085F6E9BEC6}.Release|x86.Build.0 = Release|Any CPU
 		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Debug|x86.Build.0 = Debug|Any CPU
 		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Release|x86.ActiveCfg = Release|Any CPU