diff --git a/Cake.Recipe/Content/setup.cake b/Cake.Recipe/Content/setup.cake
index 029d4732..129fbe5a 100644
--- a/Cake.Recipe/Content/setup.cake
+++ b/Cake.Recipe/Content/setup.cake
@@ -50,6 +50,15 @@ Setup<BuildData>(context =>
         .IsDependentOn("Build")
         .IsDependentOn("InspectCode");
 
+    // Define additional URL resolvers for Cake.Issues
+
+    // Rules from https://github.com/cake-contrib/CakeContrib.Guidelines
+    MsBuildAddRuleUrlResolver(x =>
+        x.Category.ToUpperInvariant() == "CCG" ?
+        new Uri("https://cake-contrib.github.io/CakeContrib.Guidelines/rules/" + x.Rule.ToLowerInvariant()) :
+        null,
+        5);
+
     return new BuildData(context);
 });
 
diff --git a/Cake.Recipe/Content/toolsettings.cake b/Cake.Recipe/Content/toolsettings.cake
index e6ab340c..4d198786 100644
--- a/Cake.Recipe/Content/toolsettings.cake
+++ b/Cake.Recipe/Content/toolsettings.cake
@@ -46,7 +46,7 @@ public static class ToolSettings
         string gitReleaseManagerTool = "#tool nuget:?package=GitReleaseManager&version=0.11.0",
         // This is specifically pinned to 5.0.1 as later versions break compatibility with Unix.
         string gitVersionTool = "#tool nuget:?package=GitVersion.CommandLine&version=5.0.1",
-        string reSharperTools = "#tool nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2020.2.3",
+        string reSharperTools = "#tool nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2020.2.4",
         string kuduSyncTool = "#tool nuget:?package=KuduSync.NET&version=1.5.3",
         string wyamTool = "#tool nuget:?package=Wyam&version=2.2.9",
         string xunitTool = "#tool nuget:?package=xunit.runner.console&version=2.4.1",