diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py
index 7cf605c..aa79c3e 100755
--- a/kindlecomicconverter/comic2ebook.py
+++ b/kindlecomicconverter/comic2ebook.py
@@ -336,6 +336,8 @@ def buildOPF(dstdir, title, filelist, cover=None):
                 ".xhtml\" media-type=\"application/xhtml+xml\"/>\n")
         if '.png' == filename[1]:
             mt = 'image/png'
+        elif '.gif' == filename[1]:
+            mt = 'image/gif'
         else:
             mt = 'image/jpeg'
         f.write("<item id=\"img_" + str(uniqueid) + "\" href=\"" + folder + "/" + path[1] + "\" media-type=\"" +
diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py
index 52d7ab6..e0b4eb2 100755
--- a/kindlecomicconverter/image.py
+++ b/kindlecomicconverter/image.py
@@ -325,8 +325,12 @@ class ComicPage:
     def save_with_codec(self, image, targetPath):
         if self.opt.forcepng:
             image.info["transparency"] = None
-            targetPath += '.png'
-            image.save(targetPath, 'PNG', optimize=1)
+            if self.opt.iskindle and ('MOBI' in self.opt.format or 'EPUB' in self.opt.format):
+                targetPath += '.gif'
+                image.save(targetPath, 'GIF', optimize=1, interlace=False)
+            else:
+                targetPath += '.png'
+                image.save(targetPath, 'PNG', optimize=1)
         else:
             targetPath += '.jpg'
             if self.opt.mozjpeg: