diff --git a/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs
new file mode 100644
index 000000000..f7faaea38
--- /dev/null
+++ b/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs
@@ -0,0 +1,24 @@
+using System;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.HealthCheck;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.HealthCheck
+{
+    [TestFixture]
+    public class HealthCheckFixture : CoreTest
+    {
+        private const string WikiRoot = "https://github.com/Sonarr/Sonarr/wiki/";
+
+        [TestCase("I blew up because of some weird user mistake", null, WikiRoot + "Health-checks#i-blew-up-because-of-some-weird-user-mistake")]
+        [TestCase("I blew up because of some weird user mistake", "#my-health-check", WikiRoot + "Health-checks#my-health-check")]
+        [TestCase("I blew up because of some weird user mistake", "Custom-Page#my-health-check", WikiRoot + "Custom-Page#my-health-check")]
+        public void should_format_wiki_url(string message, string wikiFragment, string expectedUrl)
+        {
+            var subject = new NzbDrone.Core.HealthCheck.HealthCheck(typeof(HealthCheckBase), HealthCheckResult.Warning, message, wikiFragment);
+
+            subject.WikiUrl.Should().Be(expectedUrl);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index d61e4cadb..9bf60de39 100644
--- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -178,6 +178,7 @@
     <Compile Include="HealthCheck\Checks\MonoVersionCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\RootFolderCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\UpdateCheckFixture.cs" />
+    <Compile Include="HealthCheck\HealthCheckFixture.cs" />
     <Compile Include="HistoryTests\HistoryRepositoryFixture.cs" />
     <Compile Include="HistoryTests\HistoryServiceFixture.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupAdditionalNamingSpecsFixture.cs" />
diff --git a/src/NzbDrone.Core/HealthCheck/HealthCheck.cs b/src/NzbDrone.Core/HealthCheck/HealthCheck.cs
index 31f0a3035..e720aca8f 100644
--- a/src/NzbDrone.Core/HealthCheck/HealthCheck.cs
+++ b/src/NzbDrone.Core/HealthCheck/HealthCheck.cs
@@ -34,10 +34,17 @@ namespace NzbDrone.Core.HealthCheck
 
         private static Uri MakeWikiUrl(String fragment)
         {
-            var rootUri = new Uri("https://github.com/NzbDrone/NzbDrone/wiki/Health-checks");
-            var fragmentUri = new Uri(fragment, UriKind.Relative);
+            var rootUri = new Uri("https://github.com/Sonarr/Sonarr/wiki/Health-checks");
+            if (fragment.StartsWith("#"))
+            { // Mono doesn't understand # and generates a different url than windows.
+                return new Uri(rootUri + fragment);
+            }
+            else
+            {
+                var fragmentUri = new Uri(fragment, UriKind.Relative);
 
-            return new Uri(rootUri, fragmentUri);
+                return new Uri(rootUri, fragmentUri);
+            }
         }
     }