diff --git a/lib/rbcodec/metadata/ape.c b/lib/rbcodec/metadata/ape.c
index 1460e4aa95..d6457eab63 100644
--- a/lib/rbcodec/metadata/ape.c
+++ b/lib/rbcodec/metadata/ape.c
@@ -124,7 +124,7 @@ bool read_ape_tags(int fd, struct mp3entry* id3)
                     return false;
                 }
 
-                if (!strcasecmp(name, "cuesheet"))
+                if (strcasecmp(name, "cuesheet") == 0)
                 {
                     id3->has_embedded_cuesheet = true;
                     id3->embedded_cuesheet.pos = lseek(fd, 0, SEEK_CUR)-item.length;
@@ -152,17 +152,24 @@ bool read_ape_tags(int fd, struct mp3entry* id3)
                     }
 
                     /* Gather the album art format from the pseudo file name's ending. */
-                    strcpy(name, name + strlen(name) - 4);
+                    /* strcpy(name, name + strlen(name) - 4); */
                     id3->albumart.type = AA_TYPE_UNKNOWN;
-                    if      (strcasecmp(name, ".jpg") == 0)
+                    char *ext = strrchr(name, '.');
+                    if (ext)
                     {
-                        id3->albumart.type = AA_TYPE_JPG;
+                        if      (strcasecmp(ext, ".jpg") == 0)
+                        {
+                            id3->albumart.type = AA_TYPE_JPG;
+                        }
+                        else if (strcasecmp(ext, ".jpeg") == 0)
+                        {
+                            id3->albumart.type = AA_TYPE_JPG;
+                        }
+                        else if (strcasecmp(ext, ".png") == 0)
+                        {
+                            id3->albumart.type = AA_TYPE_PNG;
+                        }
                     }
-                    else if (strcasecmp(name, ".png") == 0)
-                    {
-                        id3->albumart.type = AA_TYPE_PNG;
-                    }
-
                     /* Set the album art size and position. */
                     if (id3->albumart.type != AA_TYPE_UNKNOWN)
                     {