diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index f711d009251..c8f7ecc5bd0 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -1341,6 +1341,12 @@ because xbuild doesn't support framework reference assemblies.
   <MakeDir Directories="$(MonoAndroidIntermediateAssemblyDir)" Condition=" !Exists ('$(MonoAndroidIntermediateAssemblyDir)') " />
 </Target>
 
+<Target Name="_CollectRuntimePackJarFiles">
+  <ItemGroup>
+    <AndroidJavaLibrary Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.jar' " />
+  </ItemGroup>
+</Target>
+
 <Target Name="_CollectRuntimeJarFilenames">
   <PropertyGroup>
     <_RuntimeJar Condition=" '$(UsingAndroidNETSdk)' != 'True' ">$(MSBuildThisFileDirectory)\java_runtime.jar</_RuntimeJar>
@@ -1861,6 +1867,7 @@ because xbuild doesn't support framework reference assemblies.
 
 <PropertyGroup>
     <_CompileJavaDependsOnTargets>
+		_CollectRuntimePackJarFiles;
 		_AdjustJavacVersionArguments;
 		_GeneratePackageManagerJava;
 		_FindJavaStubFiles;