diff --git a/ClosedXML/Excel/Drawings/IXLPicture.cs b/ClosedXML/Excel/Drawings/IXLPicture.cs
index 15d6b2a..857488f 100644
--- a/ClosedXML/Excel/Drawings/IXLPicture.cs
+++ b/ClosedXML/Excel/Drawings/IXLPicture.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.IO;
+using DocumentFormat.OpenXml.Packaging;
 
 namespace ClosedXML.Excel.Drawings
 {
@@ -23,6 +24,17 @@
         long RawOffsetY { get; set; }
         bool IsAbsolute { get; set; }
 
+        /// <summary>
+        /// Type of image. The supported formats are defined by OpenXML's ImagePartType.
+        /// Default value is "jpeg"
+        /// </summary>
+        String Type { get; set; }
+
         String Name { get; set; }
+
+        /// <summary>
+        /// Get the enum representation of the Picture type.
+        /// </summary>
+        ImagePartType GetImagePartType();
     }
 }
diff --git a/ClosedXML/Excel/Drawings/XLPicture.cs b/ClosedXML/Excel/Drawings/XLPicture.cs
index ea5943a..edaea9a 100644
--- a/ClosedXML/Excel/Drawings/XLPicture.cs
+++ b/ClosedXML/Excel/Drawings/XLPicture.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.IO;
+using DocumentFormat.OpenXml.Packaging;
 
 namespace ClosedXML.Excel.Drawings
 {
@@ -12,6 +13,7 @@
         private List<IXLMarker> Markers;
         private String name;
         private bool isAbsolute;
+        private ImagePartType type = ImagePartType.Jpeg;
 
         private long iMaxWidth = 500;
         private long iMaxHeight = 500;
@@ -209,5 +211,34 @@
                 isAbsolute = value;
             }
         }
+
+        public String Type
+        {
+            get
+            {
+                return GetExtension(type);
+            }
+            set
+            {
+                try
+                {
+                    type = (ImagePartType)Enum.Parse(typeof(ImagePartType), value, true);
+                }
+                catch
+                {
+                    type = ImagePartType.Jpeg;
+                }
+            }
+        }
+
+        private String GetExtension(ImagePartType type)
+        {
+            return type.ToString();
+        }
+
+        public ImagePartType GetImagePartType()
+        {
+            return type;
+        }
     }
 }
diff --git a/ClosedXML/Excel/XLWorkbook_Save.cs b/ClosedXML/Excel/XLWorkbook_Save.cs
index 8e2cd4f..0237a65 100644
--- a/ClosedXML/Excel/XLWorkbook_Save.cs
+++ b/ClosedXML/Excel/XLWorkbook_Save.cs
@@ -2517,7 +2517,8 @@
 
             var worksheetDrawing = drawingsPart.WorksheetDrawing;
 
-            var imagePart = drawingsPart.AddImagePart(ImagePartType.Png, GeneratePartId(picture.Name, drawingsPart));
+            var imagePart = drawingsPart.AddImagePart(picture.GetImagePartType(),
+                                                        GeneratePartId(picture.Name, drawingsPart));
 
             using (Stream stream = new MemoryStream())
             {
diff --git a/ClosedXML_Examples/ClosedXML_Examples.csproj b/ClosedXML_Examples/ClosedXML_Examples.csproj
index 6e3a510..de7cb8e 100644
--- a/ClosedXML_Examples/ClosedXML_Examples.csproj
+++ b/ClosedXML_Examples/ClosedXML_Examples.csproj
@@ -77,6 +77,7 @@
     <Compile Include="Comments\EditingComments.cs" />
     <Compile Include="ConditionalFormatting\ConditionalFormatting.cs" />
     <Compile Include="Delete\DeleteFewWorksheets.cs" />
+    <Compile Include="ImageHandling\ImageFormats.cs" />
     <Compile Include="ImageHandling\ImageAnchors.cs" />
     <Compile Include="IXLExample.cs" />
     <Compile Include="Misc\AdjustToContentsWithAutoFilter.cs" />
@@ -181,6 +182,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\ImageHandling.png" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\ImageHandling.jpg" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ClosedXML_Examples/ImageHandling/ImageAnchors.cs b/ClosedXML_Examples/ImageHandling/ImageAnchors.cs
index 5e141b9..351ab4b 100644
--- a/ClosedXML_Examples/ImageHandling/ImageAnchors.cs
+++ b/ClosedXML_Examples/ImageHandling/ImageAnchors.cs
@@ -24,6 +24,7 @@
                     IsAbsolute = true,
                     ImageStream = fs,
                     Name = "Image10",
+                    Type = "png",
                     OffsetX = 220,
                     OffsetY = 150
                 };
@@ -37,6 +38,7 @@
                     IsAbsolute = false,
                     ImageStream = fs,
                     Name = "Image11",
+                    Type = "png",
                     OffsetX = 0,
                     OffsetY = 0
                 };
@@ -59,6 +61,7 @@
                     IsAbsolute = false,
                     ImageStream = fs,
                     Name = "Image20",
+                    Type = "png",
                     OffsetX = 0,
                     OffsetY = 0
                 };
diff --git a/ClosedXML_Examples/ImageHandling/ImageFormats.cs b/ClosedXML_Examples/ImageHandling/ImageFormats.cs
new file mode 100644
index 0000000..c420bb7
--- /dev/null
+++ b/ClosedXML_Examples/ImageHandling/ImageFormats.cs
@@ -0,0 +1,68 @@
+using System;
+using System.IO;
+using System.Reflection;
+using ClosedXML.Excel;
+using ClosedXML.Excel.Drawings;
+
+namespace ClosedXML_Examples
+{
+    public class ImageFormats : IXLExample
+    {
+        public void Create(string filePath)
+        {
+            var wb = new XLWorkbook();
+            XLPicture pic;
+            IXLWorksheet ws;
+
+            using (Stream fs = Assembly.GetExecutingAssembly().GetManifestResourceStream("ClosedXML_Examples.Resources.ImageHandling.jpg"))
+            {
+                #region Jpeg
+                ws = wb.Worksheets.Add("Jpg");
+                pic = new XLPicture()
+                {
+                    IsAbsolute = false,
+                    ImageStream = fs,
+                    Name = "JpegImage",
+                    Type = "jpeg",
+                    OffsetX = 0,
+                    OffsetY = 0
+                };
+
+                pic.AddMarker(new XLMarker
+                {
+                    ColumnId = 0,
+                    RowId = 0
+                });
+
+                ws.AddPicture(pic);
+                #endregion
+            }
+
+            using (Stream fs = Assembly.GetExecutingAssembly().GetManifestResourceStream("ClosedXML_Examples.Resources.ImageHandling.png"))
+            {
+                #region Png
+                ws = wb.Worksheets.Add("Png");
+                pic = new XLPicture()
+                {
+                    IsAbsolute = false,
+                    ImageStream = fs,
+                    Name = "PngImage",
+                    Type = "png",
+                    OffsetX = 0,
+                    OffsetY = 0
+                };
+
+                pic.AddMarker(new XLMarker
+                {
+                    ColumnId = 0,
+                    RowId = 0
+                });
+
+                ws.AddPicture(pic);
+                #endregion
+
+                wb.SaveAs(filePath);
+            }
+        }
+    }
+}
diff --git a/ClosedXML_Examples/Resources/ImageHandling.jpg b/ClosedXML_Examples/Resources/ImageHandling.jpg
new file mode 100644
index 0000000..6ddf89a
--- /dev/null
+++ b/ClosedXML_Examples/Resources/ImageHandling.jpg
Binary files differ
diff --git a/ClosedXML_Tests/ClosedXML_Tests.csproj b/ClosedXML_Tests/ClosedXML_Tests.csproj
index ee635ec..00cbfef 100644
--- a/ClosedXML_Tests/ClosedXML_Tests.csproj
+++ b/ClosedXML_Tests/ClosedXML_Tests.csproj
@@ -270,6 +270,7 @@
     <EmbeddedResource Include="Resource\Examples\PivotTables\PivotTables.xlsx" />
     <None Include="packages.config" />
     <EmbeddedResource Include="Resource\Examples\ImageHandling\ImageHandling.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ImageHandling\ImageFormats.xlsx" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/ClosedXML_Tests/Examples/ImageHandlingTests.cs b/ClosedXML_Tests/Examples/ImageHandlingTests.cs
index dd3aa6a..9299dab 100644
--- a/ClosedXML_Tests/Examples/ImageHandlingTests.cs
+++ b/ClosedXML_Tests/Examples/ImageHandlingTests.cs
@@ -11,5 +11,11 @@
         {
             TestHelper.RunTestExample<ImageAnchors>(@"ImageHandling\ImageHandling.xlsx");
         }
+
+        [Test]
+        public void ImageFormats()
+        {
+            TestHelper.RunTestExample<ImageFormats>(@"ImageHandling\ImageFormats.xlsx");
+        }
     }
 }
\ No newline at end of file
diff --git a/ClosedXML_Tests/Resource/Examples/ImageHandling/ImageFormats.xlsx b/ClosedXML_Tests/Resource/Examples/ImageHandling/ImageFormats.xlsx
new file mode 100644
index 0000000..ff05efe
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ImageHandling/ImageFormats.xlsx
Binary files differ