diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs
index 678c9c73380..a8e75ced172 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs
@@ -21,43 +21,21 @@ public class ClassParse : Task
 		[Required]
 		public ITaskItem[] SourceJars { get; set; }
 
-		public ITaskItem[] JavaDocPaths { get; set; }
-
-		public ITaskItem[] Java7DocPaths { get; set; }
-
-		public ITaskItem[] Java8DocPaths { get; set; }
-
-		public ITaskItem[] DroidDocPaths { get; set; }
-
-		public ITaskItem [] DroidDoc2Paths { get; set; }
-
-		public ITaskItem [] JavaDocs { get; set; }
-
-		public IEnumerable<ITaskItem> DocsPaths {
-			get {
-				Func<ITaskItem[],IEnumerable<ITaskItem>> f = l => l ?? Enumerable.Empty<ITaskItem> ();
-				return f (JavaDocPaths).Concat (f (Java7DocPaths)).Concat (f (Java8DocPaths)).Concat (f (DroidDocPaths)).Concat (f (DroidDoc2Paths)).Concat (f (JavaDocs));
-			}
-		}
+		public ITaskItem [] DocumentationPaths { get; set; }
 
 		public override bool Execute ()
 		{
 			Log.LogDebugMessage ("ClassParse Task");
 			Log.LogDebugMessage ("  OutputFile: {0}", OutputFile);
 			Log.LogTaskItems ("  SourceJars: ", SourceJars);
-			Log.LogTaskItems ("  JavaDocPaths: ", JavaDocPaths);
-			Log.LogTaskItems ("  Java7DocPaths: ", Java7DocPaths);
-			Log.LogTaskItems ("  Java8DocPaths: ", Java8DocPaths);
-			Log.LogTaskItems ("  DroidDocPaths: ", DroidDocPaths);
-			Log.LogTaskItems ("  DroidDoc2Paths: ", DroidDoc2Paths);
-			Log.LogTaskItems ("  JavaDocs: ", JavaDocs);
+			Log.LogTaskItems ("  DocumentationPaths: ", DocumentationPaths);
 
 			using (var output = new StreamWriter (OutputFile, append: false, 
 						encoding: new UTF8Encoding (encoderShouldEmitUTF8Identifier: false))) {
 				Bytecode.Log.OnLog = LogEventHandler;
 				var classPath = new Bytecode.ClassPath () {
 					ApiSource = "class-parse",
-					DocumentationPaths = (DocsPaths ?? Enumerable.Empty<ITaskItem> ()).Select(x => x.ItemSpec)
+					DocumentationPaths = (DocumentationPaths ?? Enumerable.Empty<ITaskItem> ()).Select(x => x.ItemSpec)
 				};
 				foreach (var jar in SourceJars) {
 					if (Bytecode.ClassPath.IsJarFile (jar.ItemSpec)) {
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets
index 4016c475b69..c063e092880 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets
@@ -366,16 +366,20 @@ Copyright (C) 2012 Xamarin Inc. All rights reserved.
       <Output TaskParameter="Include" ItemName="ReferenceJar" />
     </CreateItem>
 
+    <ItemGroup>
+      <_AndroidDocumentationPath Include="@(JavaDocIndex)" />
+      <_AndroidDocumentationPath Include="$(JavaDocPaths)" />
+      <_AndroidDocumentationPath Include="$(Java7DocPaths)" />
+      <_AndroidDocumentationPath Include="$(Java8DocPaths)" />
+      <_AndroidDocumentationPath Include="$(DroidDocPaths)" />
+      <_AndroidDocumentationPath Include="@(JavaDocJar->'$(IntermediateOutputPath)javadocs\%(FileName)')" />
+    </ItemGroup>
+    
     <!-- Extract the API from the .jar file and store as .xml, using either class-parse or jar2xml -->
-	
     <ClassParse Condition="'$(AndroidClassParser)' == 'class-parse'"
       OutputFile="$(ApiOutputFile).class-parse"
       SourceJars="@(EmbeddedJar);@(InputJar)"
-      JavaDocPaths="$(JavaDocPaths)"
-      Java7DocPaths="$(Java7DocPaths)"
-      Java8DocPaths="$(Java8DocPaths)"
-      DroidDocPaths="$(DroidDocPaths)"
-      JavaDocs="@(JavaDocJar->'$(IntermediateOutputPath)javadocs\%(FileName)')"
+      DocumentationPaths="@(_AndroidDocumentationPath)"
     />
 
     <BindingsGenerator Condition="'$(AndroidClassParser)' == 'class-parse'"