diff --git a/Makefile b/Makefile
index ad8357e788f..73d3eb1a882 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CONFIGURATION = Debug
-MSBUILD       = xbuild /p:Configuration=$(CONFIGURATION)
+MSBUILD       = xbuild /p:Configuration=$(CONFIGURATION) $(MSBUILD_ARGS)
 
 all:
 	$(MSBUILD)
diff --git a/build-tools/android-toolchain/android-toolchain.projitems b/build-tools/android-toolchain/android-toolchain.projitems
index a1f54167d02..d6d91888c91 100644
--- a/build-tools/android-toolchain/android-toolchain.projitems
+++ b/build-tools/android-toolchain/android-toolchain.projitems
@@ -4,6 +4,20 @@
     <AndroidUri Condition=" '$(AndroidUri)' == '' ">https://dl-ssl.google.com/android/repository</AndroidUri>
   </PropertyGroup>
   <ItemGroup>
+    <AndroidNdkItem Include="android-ndk-r11c-linux-x86_64.zip">
+      <HostOS>Linux</HostOS>
+    </AndroidNdkItem>
+    <AndroidSdkItem Include="build-tools_r23-linux.zip">
+      <HostOS>Linux</HostOS>
+      <DestDir>build-tools\23.0.0</DestDir>
+    </AndroidSdkItem>
+    <AndroidSdkItem Include="platform-tools_r23-linux.zip">
+      <HostOS>Linux</HostOS>
+      <DestDir>platform-tools</DestDir>
+    </AndroidSdkItem>
+    <AndroidSdkItem Include="tools_r24.4.1-linux.zip">
+      <HostOS>Linux</HostOS>
+    </AndroidSdkItem>
     <AndroidNdkItem Include="android-ndk-r11c-darwin-x86_64.zip">
       <HostOS>Darwin</HostOS>
     </AndroidNdkItem>
@@ -15,13 +29,15 @@
       <HostOS>Darwin</HostOS>
       <DestDir>platform-tools</DestDir>
     </AndroidSdkItem>
-    <AndroidSdkItem Include="android-sdk_r24.4.1-macosx.zip">
+    <AndroidSdkItem Include="tools_r24.4.1-macosx.zip">
       <HostOS>Darwin</HostOS>
     </AndroidSdkItem>
     <AndroidSdkItem Include="platform-N_r01.zip">
+      <HostOS></HostOS>
       <DestDir>platforms\android-N</DestDir>
     </AndroidSdkItem>
     <AndroidSdkItem Include="android-23_r01.zip">
+      <HostOS></HostOS>
       <DestDir>platforms\android-23</DestDir>
     </AndroidSdkItem>
   </ItemGroup>
diff --git a/build-tools/android-toolchain/android-toolchain.targets b/build-tools/android-toolchain/android-toolchain.targets
index 5bec5a907ec..c4f161dcd06 100644
--- a/build-tools/android-toolchain/android-toolchain.targets
+++ b/build-tools/android-toolchain/android-toolchain.targets
@@ -11,24 +11,37 @@
   <UsingTask AssemblyFile="$(OutputPath)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.CreateTemporaryDirectory" />
   <UsingTask AssemblyFile="$(OutputPath)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.DownloadUri" />
   <UsingTask AssemblyFile="$(OutputPath)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.UnzipDirectoryChildren" />
+  <Target Name="_DetermineItems">
+    <CreateItem
+        Include="@(AndroidSdkItem)"
+        Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
+			<Output TaskParameter="Include" ItemName="_PlatformAndroidSdkItem"/>
+    </CreateItem>
+    <CreateItem
+        Include="@(AndroidNdkItem)"
+        Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
+			<Output TaskParameter="Include" ItemName="_PlatformAndroidNdkItem"/>
+    </CreateItem>
+  </Target>
   <Target Name="_DownloadItems"
-      Outputs="@(AndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)');@(AndroidNdkItems->'$(AndroidToolchainCacheDirectory)\%(Identity)')">
+      DependsOnTargets="_DetermineItems"
+      Outputs="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)');@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)')">
     <DownloadUri
-        SourceUris="@(AndroidSdkItem->'$(AndroidUri)/%(Identity)');@(AndroidNdkItem->'$(AndroidUri)/%(Identity)')"
-        DestinationFiles="@(AndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)');@(AndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)')"
+        SourceUris="@(_PlatformAndroidSdkItem->'$(AndroidUri)/%(Identity)');@(_PlatformAndroidNdkItem->'$(AndroidUri)/%(Identity)')"
+        DestinationFiles="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)');@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)')"
     />
   </Target>
   <Target Name="_UnzipFiles"
-      Inputs="@(AndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)')"
+      DependsOnTargets="_DetermineItems"
+      Inputs="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)')"
       Outputs="$(AndroidToolchainDirectory)\.stamp-sdk">
     <CreateItem
-        Include="@(AndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)"
-        Condition=" '%(AndroidSdkItem.HostOS)' == '$(HostOS)' Or '%(AndroidSdkItem.HostOS)' == '' ">
-			<Output TaskParameter="Include" ItemName="_AndroidSdkItems"/>
+        Include="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(_PlatformAndroidSdkItem.Identity)">
+      <Output TaskParameter="Include" ItemName="_AndroidSdkItems"/>
     </CreateItem>
     <CreateItem
-        Include="@(AndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)"
-        Condition=" '%(AndroidSdkItem.HostOS)' == '$(HostOS)' Or '%(AndroidSdkItem.HostOS)' == '' ">
+        Include="@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(_PlatformAndroidNdkItem.Identity)"
+        Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
       <Output TaskParameter="Include" ItemName="_AndroidNdkItems"/>
     </CreateItem>
 
diff --git a/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/DownloadUri.cs b/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/DownloadUri.cs
index a5feff48103..4fd2bb963fb 100644
--- a/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/DownloadUri.cs
+++ b/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/DownloadUri.cs
@@ -42,6 +42,7 @@ public override bool Execute ()
 
 			var tasks   = new TTask [SourceUris.Length];
 			using (var client = new HttpClient ()) {
+				client.Timeout = TimeSpan.FromHours (3);
 				for (int i = 0; i < SourceUris.Length; ++i) {
 					tasks [i] = DownloadFile (client, SourceUris [i], DestinationFiles [i].ItemSpec);
 				}
@@ -57,6 +58,7 @@ async TTask DownloadFile (HttpClient client, string uri, string destinationFile)
 				Log.LogMessage (MessageImportance.Normal, $"Skipping uri '{uri}' as destination file already exists '{destinationFile}'.");
 				return;
 			}
+			Log.LogMessage (MessageImportance.Low, $"Downloading '{uri}'.");
 			using (var r = await client.GetAsync (uri))
 			using (var o = File.OpenWrite (destinationFile)) {
 				await r.Content.CopyToAsync (o);