diff --git a/Makefile b/Makefile
index 8557d491413..01e733af076 100644
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,12 @@ endif
 all:
 	$(MSBUILD)
 
-prepare:: prepare-props
+prepare:: prepare-external prepare-props
+
+prepare-external:
 	git submodule update --init --recursive
 	nuget restore
-	(cd external/Java.Interop && nuget restore)
+	(cd `$(MSBUILD) /nologo /v:minimal /t:GetJavaInteropFullPath build-tools/scripts/Paths.targets` && nuget restore)
 
 prepare-props:
 	cp Configuration.Java.Interop.Override.props external/Java.Interop/Configuration.Override.props
diff --git a/build-tools/scripts/Paths.targets b/build-tools/scripts/Paths.targets
index dd9c1ef0891..c0c88bf4e39 100644
--- a/build-tools/scripts/Paths.targets
+++ b/build-tools/scripts/Paths.targets
@@ -13,6 +13,12 @@
         Importance="High"
     />
   </Target>
+  <Target Name="GetJavaInteropFullPath">
+    <Message
+        Text="$(JavaInteropFullPath)"
+        Importance="High"
+    />
+  </Target>
   <Target Name="GetMonoSourceFullPath">
     <Message
         Text="$(MonoSourceFullPath)"