diff --git a/Thumbnailer.go b/Thumbnailer.go
index ac8c3cf..913c7ee 100644
--- a/Thumbnailer.go
+++ b/Thumbnailer.go
@@ -2,6 +2,7 @@ package thumbnail
 
 import (
 	"fmt"
+	"image/gif"
 	"image/jpeg"
 	"image/png"
 	"os"
@@ -76,6 +77,14 @@ func (this *Thumbnailer) RenderFile_NoCache(absPath string) ([]byte, error) {
 
 		return this.RenderScaledImage(src)
 
+	case ".gif":
+		src, err := gif.Decode(fh)
+		if err != nil {
+			return nil, err
+		}
+
+		return this.RenderScaledImage(src)
+
 	case ".avi", ".mkv", ".mp4", ".ogm", ".wmv":
 		return this.RenderScaledFfmpeg(absPath)