diff --git a/NuGet/StaticGraphics/Shiroka.Avalonia.StaticLink.csproj b/NuGet/StaticGraphics/Shiroka.Avalonia.StaticLink.csproj
index fa75f67..de36024 100644
--- a/NuGet/StaticGraphics/Shiroka.Avalonia.StaticLink.csproj
+++ b/NuGet/StaticGraphics/Shiroka.Avalonia.StaticLink.csproj
@@ -28,11 +28,11 @@
         <None Include="buildTransitive/Shiroka.Avalonia.StaticLink.props" Pack="true" PackagePath="buildTransitive/$(PackageId).props" />
         <None Include="buildTransitive/Shiroka.Avalonia.StaticLink.targets" Pack="true" PackagePath="buildTransitive/$(PackageId).targets" />
         <None Include="buildTransitive/Shiroka.Avalonia.StaticLink.MacOSFontWarmup.cs" Pack="true" PackagePath="buildTransitive/Shiroka.Avalonia.StaticLink.MacOSFontWarmup.cs" />
-        <None Include="../../External/NativeStatic/win-x64/*" Pack="true" PackagePath="static/win-x64/native/" />
-        <None Include="../../External/NativeStatic/win-arm64/*" Pack="true" PackagePath="static/win-arm64/native/" />
-        <None Include="../../External/NativeStatic/linux-x64/*" Pack="true" PackagePath="static/linux-x64/native/" />
-        <None Include="../../External/NativeStatic/linux-arm64/*" Pack="true" PackagePath="static/linux-arm64/native/" />
-        <None Include="../../External/NativeStatic/osx-x64/*" Pack="true" PackagePath="static/osx-x64/native/" />
-        <None Include="../../External/NativeStatic/osx-arm64/*" Pack="true" PackagePath="static/osx-arm64/native/" />
+        <None Include="../../External/NativeStatic/win-x64/native/**/*" Pack="true" PackagePath="static/win-x64/native/%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Include="../../External/NativeStatic/win-arm64/native/**/*" Pack="true" PackagePath="static/win-arm64/native/%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Include="../../External/NativeStatic/linux-x64/native/**/*" Pack="true" PackagePath="static/linux-x64/native/%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Include="../../External/NativeStatic/linux-arm64/native/**/*" Pack="true" PackagePath="static/linux-arm64/native/%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Include="../../External/NativeStatic/osx-x64/native/**/*" Pack="true" PackagePath="static/osx-x64/native/%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Include="../../External/NativeStatic/osx-arm64/native/**/*" Pack="true" PackagePath="static/osx-arm64/native/%(RecursiveDir)%(Filename)%(Extension)" />
     </ItemGroup>
 </Project>
diff --git a/NuGet/StaticGraphics/buildTransitive/Shiroka.Avalonia.StaticLink.targets b/NuGet/StaticGraphics/buildTransitive/Shiroka.Avalonia.StaticLink.targets
index 59e8fbb..77d9d0a 100644
--- a/NuGet/StaticGraphics/buildTransitive/Shiroka.Avalonia.StaticLink.targets
+++ b/NuGet/StaticGraphics/buildTransitive/Shiroka.Avalonia.StaticLink.targets
@@ -84,6 +84,14 @@
         </ItemGroup>
     </Target>
 
+    <Target Name="ShirokaAvaloniaStaticLinkValidateMacOSStaticLibraries"
+            BeforeTargets="LinkNative"
+            Condition="'$(PublishAot)' == 'true' and ('$(RuntimeIdentifier)' == 'osx-x64' or '$(RuntimeIdentifier)' == 'osx-arm64') and '$(_ShirokaAvaloniaStaticLinkNativeRoot)' != ''">
+        <Error Condition="!Exists('$(_ShirokaAvaloniaStaticLinkNativeRoot)/libHarfBuzzSharp.a')" Text="Missing static library: $(_ShirokaAvaloniaStaticLinkNativeRoot)/libHarfBuzzSharp.a" />
+        <Error Condition="!Exists('$(_ShirokaAvaloniaStaticLinkNativeRoot)/libskia.a')" Text="Missing static library: $(_ShirokaAvaloniaStaticLinkNativeRoot)/libskia.a" />
+        <Error Condition="!Exists('$(_ShirokaAvaloniaStaticLinkNativeRoot)/libSkiaSharp.a')" Text="Missing static library: $(_ShirokaAvaloniaStaticLinkNativeRoot)/libSkiaSharp.a" />
+    </Target>
+
     <Target Name="ShirokaAvaloniaStaticLinkCleanDynamicAssets"
             AfterTargets="Publish"
             Condition="'$(PublishAot)' == 'true' and '$(_ShirokaAvaloniaStaticLinkNativeRoot)' != ''">