diff --git a/Programs/Baker/Baker.csproj b/Programs/Baker/Baker.csproj
index 2361ab11..76c17d2b 100644
--- a/Programs/Baker/Baker.csproj
+++ b/Programs/Baker/Baker.csproj
@@ -28,4 +28,7 @@
 	<None Include="..\..\README.md" Pack="true" PackagePath="\" />
 	<None Include="..\..\data\logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Drawing.Common" Version="8.0.7" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Programs/Baker/Oven.cs b/Programs/Baker/Oven.cs
index 7e76fc89..00028e05 100644
--- a/Programs/Baker/Oven.cs
+++ b/Programs/Baker/Oven.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Drawing;
 using System.Runtime.InteropServices;
 
 namespace Baker
diff --git a/Programs/Baker/frmBaker.cs b/Programs/Baker/frmBaker.cs
index 2ddcc708..03f694a9 100644
--- a/Programs/Baker/frmBaker.cs
+++ b/Programs/Baker/frmBaker.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Windows.Forms;
 using System.IO;
-using OpenMetaverse.Imaging;
+using System.Drawing;
+using IronSoftware.Drawing;
 
 namespace Baker
 {
@@ -26,7 +27,7 @@ namespace Baker
 
             if (stream != null)
             {
-                _alphaMask = LoadTGAClass.LoadTGA(stream);
+                _alphaMask = AnyBitmap.FromStream(stream);
                 stream.Close();
 
                 pic1.Image = Oven.ModifyAlphaMask(_alphaMask, (byte)scrollWeight.Value, 0.0f); // *HACK: