diff --git a/.gitmodules b/.gitmodules
index 60fd5a9e03..ada3ae4bbf 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 2a68aa424e..091c99430c 100644
--- a/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj
+++ b/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj
@@ -6,11 +6,7 @@
-
-
-
-
-
+
diff --git a/Emby.IsoMounting b/Emby.IsoMounting
new file mode 160000
index 0000000000..b43ef42ae2
--- /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 d5ec2a828f..24a2301664 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/MediaBrowser.Server.Mono/EmbyServer.csproj b/MediaBrowser.Server.Mono/EmbyServer.csproj
index 03cb823c15..d6e209b72a 100644
--- a/MediaBrowser.Server.Mono/EmbyServer.csproj
+++ b/MediaBrowser.Server.Mono/EmbyServer.csproj
@@ -34,12 +34,10 @@
..\ThirdParty\emby\Emby.Server.MediaEncoding.dll
-
- ..\ThirdParty\MediaBrowser.IsoMounting.Linux\MediaBrowser.IsoMounting.Linux.dll
-
+
diff --git a/MediaBrowser.Server.Mono/MonoAppHost.cs b/MediaBrowser.Server.Mono/MonoAppHost.cs
index dcf10b47fb..d4c6260594 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;