diff --git a/Make.config b/Make.config
index 2d7a3ec0ec96..c5b88c14c589 100644
--- a/Make.config
+++ b/Make.config
@@ -49,8 +49,8 @@ IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_M
 
 # Xcode 8.1
 XCODE_VERSION=8.1
-XCODE_URL=http://storage.bos.internalx.com/bot-provisioning/Xcode_8.1_beta.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode8.1-beta1.app/Contents/Developer
+XCODE_URL=http://storage.bos.xamarin.com/bot-provisioning/Xcode_8.1_beta_2.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode81-beta2.app/Contents/Developer
 
 # Minimum Mono version
 MIN_MONO_VERSION=4.4.0.148
diff --git a/mk/xamarin.mk b/mk/xamarin.mk
index fc621b20d2de..3235bf27c5b1 100644
--- a/mk/xamarin.mk
+++ b/mk/xamarin.mk
@@ -1,6 +1,6 @@
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := d86f2fafdbb60a192f5458cca02c33ec9019e09a
-NEEDED_MACCORE_BRANCH := xcode8
+NEEDED_MACCORE_VERSION := d6ca7038939ed95f8204896a6951e9d4a9cfd77f
+NEEDED_MACCORE_BRANCH := xcode8.1
 
 MACCORE_DIRECTORY := maccore
 MACCORE_MODULE    := git@github.com:xamarin/maccore.git
diff --git a/tests/xharness/Harness.cs b/tests/xharness/Harness.cs
index 80c4e01a425c..bc20e658bf1b 100644
--- a/tests/xharness/Harness.cs
+++ b/tests/xharness/Harness.cs
@@ -90,7 +90,7 @@ string DownloadMlaunch ()
 		{
 			// Just hardcode this for now. We should be able to switch to a shipped version of XS soon.
 			// NOTE: the filename part in the url must be unique so that the caching logic works properly.
-			var mlaunch_url = "http://bosstoragemirror.blob.core.windows.net/public-builder/mlaunch-307d345a06bd3f13994877ee5a4f316f5e6a7940";
+			var mlaunch_url = "http://bosstoragemirror.blob.core.windows.net/public-builder/mlaunch-d6ca7038939ed95f8204896a6951e9d4a9cfd77f";
 			var mlaunch_path = Path.Combine (Path.GetTempPath (), Path.GetFileName (mlaunch_url), "mlaunch");
 			if (File.Exists (mlaunch_path))
 				return mlaunch_path;