diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets
index 969f7786fce..9195951ad1f 100644
--- a/build-tools/mono-runtimes/mono-runtimes.targets
+++ b/build-tools/mono-runtimes/mono-runtimes.targets
@@ -8,7 +8,8 @@
   </PropertyGroup>
   <ItemGroup>
     <MonoDocCopyItem Include="monodoc.dll" />
-    <MonoDocCopyItem Include="monodoc.dll.mdb" />
+    <MonoDocCopyItemOptional Include="monodoc.pdb" />
+    <MonoDocCopyItemOptional Include="monodoc.dll.mdb" />
     <MonoDocCopyItem Include="monodoc.dll.config" />
   </ItemGroup>
   <ItemGroup>
@@ -25,13 +26,6 @@
     <_MonoProfileDir>$(MonoSourceFullPath)\mcs\class\lib\monodroid</_MonoProfileDir>
     <_MonoOutputDir>$(MonoSourceFullPath)\mcs\class\lib\net_4_x</_MonoOutputDir>
   </PropertyGroup>
-  <ItemGroup>
-    <_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoOutputDir)\%(Identity)')" />
-  </ItemGroup>
-  <ItemGroup>
-    <_MonoDocInstalledItems Include="@(MonoDocCopyItem->'$(_MandroidDir)\%(Identity)')" />
-    <_MonoDocInstalledItems Include="$(_MandroidDir)\mdoc.exe" />
-  </ItemGroup>
   <PropertyGroup>
     <ForceBuildDependsOn>
       _BuildLlvm;
@@ -146,7 +140,7 @@
     />
   </Target>
   <Target Name="_ConfigureRuntimes"
-      DependsOnTargets="_BuildLlvm"
+      DependsOnTargets="_BuildLlvm;_Autogen"
       Inputs="$(MonoSourceFullPath)\configure"
       Outputs="$(IntermediateOutputPath)\%(_MonoRuntime.Identity)\Makefile">
     <MakeDir Directories="$(IntermediateOutputPath)\%(_MonoRuntime.Identity)" />
@@ -230,7 +224,7 @@
     </ItemGroup>
   </Target>
   <Target Name="_BuildRuntimes"
-      DependsOnTargets="_GetRuntimesOutputItems"
+      DependsOnTargets="_GetRuntimesOutputItems;_ConfigureRuntimes"
       Inputs="@(_RuntimeBuildStamp)"
       Outputs="@(_RuntimeSource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_BclProfileItems);@(_MonoBtlsSource)">
     <Exec
@@ -323,9 +317,27 @@
     />
     <Touch Files="@(_InstallMonoPosixHelperOutput);@(_InstallUnstrippedMonoPosixHelperOutput)" />
   </Target>
+  <Target Name="_GetMonodocItems" DependsOnTargets="_BuildRuntimes">
+    <ItemGroup>
+      <_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoOutputDir)\%(Identity)')" />
+      <_MonoDocCopyItems
+          Condition=" Exists ('$(_MonoOutputDir)\%(Identity)') "
+          Include="@(MonoDocCopyItemOptional->'$(_MonoOutputDir)\%(Identity)')"
+      />
+    </ItemGroup>
+    <ItemGroup>
+      <_MonoDocInstalledItems Include="@(MonoDocCopyItem->'$(_MandroidDir)\%(Identity)')" />
+      <_MonoDocInstalledItems
+          Condition=" Exists ('$(_MonoOutputDir)\%(Identity)') "
+          Include="@(MonoDocCopyItemOptional->'$(_MandroidDir)\%(Identity)')"
+      />
+      <_MonoDocInstalledItems Include="$(_MandroidDir)\mdoc.exe" />
+    </ItemGroup>
+  </Target>
   <Target Name="_InstallMonoDoc"
       Inputs="@(_MonoDocCopyItems);$(_MonoOutputDir)\mdoc.exe"
-      Outputs="@(_MonoDocInstalledItems)">
+      Outputs="@(_MonoDocInstalledItems)"
+      DependsOnTargets="_GetMonodocItems">
     <MakeDir Directories="$(_MandroidDir)" />
     <Copy
         SourceFiles="@(_MonoDocCopyItems)"
@@ -474,7 +486,7 @@
     />
   </Target>
   <Target Name="GetMonoBundleItems"
-      DependsOnTargets="_GetRuntimesOutputItems;_PrepareLlvmItems">
+      DependsOnTargets="_GetRuntimesOutputItems;_GetMonodocItems;_PrepareLlvmItems">
     <ItemGroup>
       <BundleItem Include="@(_BclInstalledItem)" />
       <BundleItem Include="@(_MonoDocInstalledItems)" />
diff --git a/external/mono b/external/mono
index dd8ecf3a1dc..6019eeb483e 160000
--- a/external/mono
+++ b/external/mono
@@ -1 +1 @@
-Subproject commit dd8ecf3a1dc09e88fd5c82dddf56d14a2aff65d9
+Subproject commit 6019eeb483e1da51fbb0171b72ee6baf44fd78cf