diff --git a/.gitmodules b/.gitmodules
index bce266e9d8c1..8e22fc5f8464 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,3 +34,6 @@
 	path = external/Xamarin.MacDev
 	url = git@github.com:xamarin/Xamarin.MacDev
 	branch = master
+[submodule "external/guiunit"]
+	path = external/guiunit
+	url = https://github.com/mono/guiunit.git
diff --git a/Make.config b/Make.config
index 883f2ff4b61c..852c982554e0 100644
--- a/Make.config
+++ b/Make.config
@@ -222,6 +222,7 @@ NUNITLITE_PATH=$(TOP)/external/mono/external/nunit-lite
 OPENTK_PATH=$(TOP)/external/opentk
 MODERNHTTPCLIENT_PATH=$(TOP)/external/ModernHttpClient
 XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
+GUI_UNIT_PATH=$(TOP)/external/guiunit
 MACCORE_PATH=$(TOP)/../maccore
 
 MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current
diff --git a/external/guiunit b/external/guiunit
new file mode 160000
index 000000000000..4ca8636c9356
--- /dev/null
+++ b/external/guiunit
@@ -0,0 +1 @@
+Subproject commit 4ca8636c93566489558465ab1855cf077e8f5392
diff --git a/mk/versions.mk b/mk/versions.mk
index 3293c1e9744b..6e20be06b9f9 100644
--- a/mk/versions.mk
+++ b/mk/versions.mk
@@ -66,6 +66,7 @@ $(eval $(call CheckSubmoduleTemplate,Touch.Unit,TOUCH_UNIT))
 $(eval $(call CheckSubmoduleTemplate,opentk,OPENTK))
 $(eval $(call CheckSubmoduleTemplate,ModernHttpClient,MODERNHTTPCLIENT))
 $(eval $(call CheckSubmoduleTemplate,Xamarin.MacDev,XAMARIN_MACDEV))
+$(eval $(call CheckSubmoduleTemplate,guiunit,GUI_UNIT))
 
 include $(TOP)/mk/xamarin.mk
 
diff --git a/mk/xamarin.mk b/mk/xamarin.mk
index 91332db4705e..93e0f50798f9 100644
--- a/mk/xamarin.mk
+++ b/mk/xamarin.mk
@@ -1,5 +1,5 @@
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := 05277dd2bc19bc6d291fcd0639e571b4d222eaef
+NEEDED_MACCORE_VERSION := 07870f393340356a93a80b09b6261bad800ea736
 NEEDED_MACCORE_BRANCH := master
 
 MACCORE_DIRECTORY := maccore