diff --git a/.gitmodules b/.gitmodules
index 60fd5a9e0..ada3ae4bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "ImageMagickSharp"]
 	path = ImageMagickSharp
 	url = https://github.com/JustAMan/ImageMagickSharp.git
+[submodule "Emby.IsoMounting"]
+	path = Emby.IsoMounting
+	url = https://github.com/JustAMan/Emby.IsoMounting.git
diff --git a/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj b/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj
index 2a68aa424..091c99430 100644
--- a/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj
+++ b/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj
@@ -6,11 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ImageMagickSharp" Version="1.0.0.20" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ImageMagickSharp/ImageMagickSharp/ImageMagickSharp.csproj" />
+    <ProjectReference Include="..\ImageMagickSharp\ImageMagickSharp\ImageMagickSharp.csproj" />
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
     <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
diff --git a/Emby.IsoMounting b/Emby.IsoMounting
new file mode 160000
index 000000000..b43ef42ae
--- /dev/null
+++ b/Emby.IsoMounting
@@ -0,0 +1 @@
+Subproject commit b43ef42ae2690167f0b8a56f6d64f1bf2fcb6cf6
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index d5ec2a828..24a230166 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -17,7 +17,7 @@
     <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
     <ProjectReference Include="..\Emby.Photos\Emby.Photos.csproj" />
     <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
-    <ProjectReference Include="..\Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj" />
+    <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv\Emby.XmlTv.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MediaBrowser.Server.Mono/EmbyServer.csproj b/MediaBrowser.Server.Mono/EmbyServer.csproj
index 03cb823c1..d6e209b72 100644
--- a/MediaBrowser.Server.Mono/EmbyServer.csproj
+++ b/MediaBrowser.Server.Mono/EmbyServer.csproj
@@ -34,12 +34,10 @@
     <Reference Include="Emby.Server.MediaEncoding">
       <HintPath>..\ThirdParty\emby\Emby.Server.MediaEncoding.dll</HintPath>
     </Reference>
-    <Reference Include="MediaBrowser.IsoMounting.Linux">
-      <HintPath>..\ThirdParty\MediaBrowser.IsoMounting.Linux\MediaBrowser.IsoMounting.Linux.dll</HintPath>
-    </Reference>
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Emby.IsoMounting\IsoMounter\IsoMounter.csproj" />
     <ProjectReference Include="..\BDInfo\BDInfo.csproj" />
     <ProjectReference Include="..\DvdLib\DvdLib.csproj" />
     <ProjectReference Include="..\Emby.Dlna\Emby.Dlna.csproj" />
diff --git a/MediaBrowser.Server.Mono/MonoAppHost.cs b/MediaBrowser.Server.Mono/MonoAppHost.cs
index dcf10b47f..d4c626059 100644
--- a/MediaBrowser.Server.Mono/MonoAppHost.cs
+++ b/MediaBrowser.Server.Mono/MonoAppHost.cs
@@ -12,7 +12,7 @@ using Emby.Server.Sync;
 using MediaBrowser.Controller.Connect;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Sync;
-using MediaBrowser.IsoMounter;
+using IsoMounter;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Services;