diff --git a/Make.config b/Make.config
index 9cd02c14c5..6eff0cd56a 100644
--- a/Make.config
+++ b/Make.config
@@ -226,7 +226,7 @@ OPENTK_PATH=$(TOP)/external/opentk
 XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
 GUI_UNIT_PATH=$(TOP)/external/guiunit
 MACCORE_PATH=$(TOP)/../maccore
-LINKER_TOOLS_DIR=$(TOP)/external/linker
+LINKER_TOOLS_PATH=$(TOP)/external/linker
 
 MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current
 SYSTEM_MCS=$(MONO_PREFIX)/bin/mcs
diff --git a/mk/versions.mk b/mk/versions.mk
index 740df731cc..43be932b05 100644
--- a/mk/versions.mk
+++ b/mk/versions.mk
@@ -65,6 +65,7 @@ $(eval $(call CheckSubmoduleTemplate,Touch.Unit,TOUCH_UNIT))
 $(eval $(call CheckSubmoduleTemplate,opentk,OPENTK))
 $(eval $(call CheckSubmoduleTemplate,Xamarin.MacDev,XAMARIN_MACDEV))
 $(eval $(call CheckSubmoduleTemplate,guiunit,GUI_UNIT))
+$(eval $(call CheckSubmoduleTemplate,linker,LINKER_TOOLS))
 
 include $(TOP)/mk/xamarin.mk
 
diff --git a/tools/mmp/Makefile b/tools/mmp/Makefile
index 378d00c101..ca97b27163 100644
--- a/tools/mmp/Makefile
+++ b/tools/mmp/Makefile
@@ -16,8 +16,8 @@ $(MONO_CECIL_MDB_DLL): $(MONO_CECIL_DLL) $(CECIL_PATH)/symbols/mdb/Mono.Cecil.Md
 
 BCL_LOCATION=$(MONO_PATH)/mcs/class/lib/xammac_net_4_5
 
-LINKER_DIR=$(LINKER_TOOLS_DIR)/linker
-TUNER_DIR=$(LINKER_TOOLS_DIR)/tuner
+LINKER_DIR=$(LINKER_TOOLS_PATH)/linker
+TUNER_DIR=$(LINKER_TOOLS_PATH)/tuner
 
 linker_sources = \
 	$(LINKER_DIR)/Mono.Linker/Pipeline.cs				\
diff --git a/tools/mtouch/Makefile b/tools/mtouch/Makefile
index ccb627eac2..f4e5284908 100644
--- a/tools/mtouch/Makefile
+++ b/tools/mtouch/Makefile
@@ -11,8 +11,8 @@ CECIL_PATH=$(MONO_PATH)/external/cecil
 MONO_CECIL_FILES = $(wildcard $(CECIL_PATH)/*.cs) $(wildcard $(CECIL_PATH)/*/*.cs) $(wildcard $(CECIL_PATH)/*/*/*.cs) $(wildcard $(CECIL_PATH)/*/*/*/*.cs) $(wildcard $(CECIL_PATH)/*/*/*/*/*.cs)
 
 MONO_DIR=$(MONO_PATH)
-MONOLINKER=$(LINKER_TOOLS_DIR)/linker
-MONO_TUNER=$(LINKER_TOOLS_DIR)/tuner
+MONOLINKER=$(LINKER_TOOLS_PATH)/linker
+MONO_TUNER=$(LINKER_TOOLS_PATH)/tuner
 
 LINKER_RESOURCES = \
 	$(LINKER_DIR)/Descriptors/mscorlib.xml