diff --git a/LibreMetaverse/Assets/AssetTypes/AssetTexture.cs b/LibreMetaverse/Assets/AssetTypes/AssetTexture.cs
index 9a5a4ac4..eaa2141c 100644
--- a/LibreMetaverse/Assets/AssetTypes/AssetTexture.cs
+++ b/LibreMetaverse/Assets/AssetTypes/AssetTexture.cs
@@ -25,9 +25,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-using CSJ2K;
+using CoreJ2K;
 using OpenMetaverse.Imaging;
-using SkiaSharp;
 
 namespace OpenMetaverse.Assets
 {
@@ -79,8 +78,7 @@ namespace OpenMetaverse.Assets
         /// </summary>
         public sealed override void Encode()
         {
-            var bitmap = Image.ExportBitmap();
-            AssetData = J2kImage.ToBytes(J2kImage.CreateEncodableSource(bitmap));
+            AssetData = J2kImage.ToBytes(Image.ExportBitmap());
         }
 
         /// <summary>
diff --git a/LibreMetaverse/Imaging/ManagedImage.cs b/LibreMetaverse/Imaging/ManagedImage.cs
index 39f3fc1e..5ca75c26 100644
--- a/LibreMetaverse/Imaging/ManagedImage.cs
+++ b/LibreMetaverse/Imaging/ManagedImage.cs
@@ -26,7 +26,7 @@
  */
 
 using System;
-using CSJ2K.Util;
+using CoreJ2K.Util;
 using SkiaSharp;
 
 namespace OpenMetaverse.Imaging
diff --git a/LibreMetaverse/ImportExport/ColladalLoader.cs b/LibreMetaverse/ImportExport/ColladalLoader.cs
index 25c57ee7..ff3d6d39 100644
--- a/LibreMetaverse/ImportExport/ColladalLoader.cs
+++ b/LibreMetaverse/ImportExport/ColladalLoader.cs
@@ -33,7 +33,7 @@ using System.IO;
 using System.Xml;
 using System.Linq;
 using System.Xml.Serialization;
-using CSJ2K;
+using CoreJ2K;
 using OpenMetaverse.ImportExport.Collada14;
 using OpenMetaverse.Rendering;
 using SkiaSharp;
@@ -161,7 +161,7 @@ namespace OpenMetaverse.ImportExport
                     bitmap = scaledImage;
                 }
 
-                material.TextureData = J2kImage.ToBytes(J2kImage.CreateEncodableSource(bitmap));
+                material.TextureData = J2kImage.ToBytes(bitmap);
 
                 Logger.Log("Successfully encoded " + fname, Helpers.LogLevel.Info);
             }
diff --git a/LibreMetaverse/LibreMetaverse.csproj b/LibreMetaverse/LibreMetaverse.csproj
index 915894c9..1b585890 100644
--- a/LibreMetaverse/LibreMetaverse.csproj
+++ b/LibreMetaverse/LibreMetaverse.csproj
@@ -43,7 +43,7 @@
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CSJ2K.Skia" Version="0.10.5.38" />
+    <PackageReference Include="CoreJ2K.Skia" Version="1.0.2.13" />
     <PackageReference Include="log4net" Version="2.0.17" />
     <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.7" />
     <PackageReference Include="OggVorbisEncoder" Version="1.2.2" />
diff --git a/Programs/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs b/Programs/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs
index 76c1b285..7da5b64a 100644
--- a/Programs/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs
+++ b/Programs/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs
@@ -29,7 +29,7 @@ using System;
 using System.Text;
 using System.IO;
 using System.Collections.Generic;
-using CSJ2K;
+using CoreJ2K;
 using OpenMetaverse.Assets;
 using OpenMetaverse.Imaging;
 using Pfim;
diff --git a/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs b/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs
index 359dddfe..6e4e060b 100644
--- a/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs
+++ b/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs
@@ -27,7 +27,7 @@
 
 using System;
 using System.Threading;
-using CSJ2K;
+using CoreJ2K;
 using SkiaSharp;
 
 namespace OpenMetaverse.TestClient
@@ -150,7 +150,7 @@ namespace OpenMetaverse.TestClient
                         bitmap = scaledImage;
                     }
                 }
-                uploadData = J2kImage.ToBytes(J2kImage.CreateEncodableSource(bitmap));
+                uploadData = J2kImage.ToBytes(bitmap);
             }
             catch (Exception ex)
             {