diff --git a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
index dcc9744136..5da1ae2dce 100644
--- a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
+++ b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
@@ -12,7 +12,7 @@ namespace Emby.Common.Implementations.EnvironmentInfo
         public MediaBrowser.Model.System.Architecture? CustomArchitecture { get; set; }
         public MediaBrowser.Model.System.OperatingSystem? CustomOperatingSystem { get; set; }
 
-        public MediaBrowser.Model.System.OperatingSystem OperatingSystem
+        public virtual MediaBrowser.Model.System.OperatingSystem OperatingSystem
         {
             get
             {
diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs
index abe39fa03d..2c57df97ca 100644
--- a/MediaBrowser.Model/System/IEnvironmentInfo.cs
+++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs
@@ -17,6 +17,7 @@ namespace MediaBrowser.Model.System
     {
         Windows,
         Linux,
-        OSX
+        OSX,
+        BSD
     }
 }
diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs
index 8100dec8d7..4790378a97 100644
--- a/MediaBrowser.Server.Mono/Program.cs
+++ b/MediaBrowser.Server.Mono/Program.cs
@@ -319,5 +319,18 @@ namespace MediaBrowser.Server.Mono
         {
             return Syscall.getuid().ToString(CultureInfo.InvariantCulture);
         }
+
+        public override Model.System.OperatingSystem OperatingSystem
+        {
+            get
+            {
+                if (IsBsd)
+                {
+                    return Model.System.OperatingSystem.BSD;
+                }
+
+                return base.OperatingSystem;
+            }
+        }
     }
 }