diff --git a/build.cake b/build.cake
index 19069fb2..6ce5d55a 100644
--- a/build.cake
+++ b/build.cake
@@ -1,34 +1,26 @@
 // Tools needed by cake addins
 #tool nuget:?package=XamarinComponent&version=1.1.0.49
 #tool nuget:?package=ILRepack&version=2.0.13
-#tool nuget:?package=Cake.MonoApiTools&version=1.0.10
+#tool nuget:?package=Cake.MonoApiTools&version=2.0.0
 #tool nuget:?package=Microsoft.DotNet.BuildTools.GenAPI&version=1.0.0-beta-00081
 #tool nuget:?package=NUnit.Runners&version=2.6.4
 #tool nuget:?package=Paket
-#tool nuget:?package=VSWhere
+#tool nuget:?package=vswhere
 
-// Dependencies of Cake Addins - this should be removed once 
-// Cake 0.23 is out
-#addin nuget:?package=SharpZipLib&version=0.86.0
+// Cake Addins
+#addin nuget:?package=Cake.FileHelpers&version=3.0.0
+#addin nuget:?package=Cake.Json&version=3.0.1
 #addin nuget:?package=Newtonsoft.Json&version=9.0.1
-#addin nuget:?package=semver&version=2.0.4
+#addin nuget:?package=Cake.Yaml&version=2.1.0
 #addin nuget:?package=YamlDotNet&version=4.2.1
-#addin nuget:?package=NuGet.Core&version=2.14.0
-
-// Cake Addins
-#addin nuget:?package=Cake.FileHelpers&version=2.0.0
-#addin nuget:?package=Cake.Json&version=2.0.28
-#addin nuget:?package=Cake.Yaml&version=2.0.0
-#addin nuget:?package=Cake.Xamarin&version=2.0.1
-#addin nuget:?package=Cake.XCode&version=3.0.0
-#addin nuget:?package=Cake.Xamarin.Build&version=3.0.6
+#addin nuget:?package=Cake.Xamarin&version=3.0.0
+#addin nuget:?package=Cake.XCode&version=4.0.0
+#addin nuget:?package=Cake.Xamarin.Build&version=4.0.0
 #addin nuget:?package=Cake.Compression&version=0.1.4
-#addin nuget:?package=Cake.Android.SdkManager&version=2.0.1
-#addin nuget:?package=Cake.Android.Adb&version=2.0.4
-
-// Not yet cake 0.22+ compatible (requires --settings_skipverification=true)
-#addin nuget:?package=Cake.MonoApiTools&version=1.0.10
-#addin nuget:?package=Cake.Xamarin.Binding.Util&version=1.0.2
+#addin nuget:?package=Cake.Android.SdkManager&version=3.0.0
+#addin nuget:?package=Cake.Android.Adb&version=3.0.0
+#addin nuget:?package=Cake.MonoApiTools&version=2.0.0
+#addin nuget:?package=Cake.Xamarin.Binding.Util&version=2.0.0
 
 // From Cake.Xamarin.Build, dumps out versions of things
 LogSystemInfo ();