diff -u -r rockbox-3.1/apps/tagcache.c rockbox-3.1-manyfile/apps/tagcache.c
--- rockbox-3.1/apps/tagcache.c	2008-12-23 17:00:51.000000000 -0500
+++ rockbox-3.1-manyfile/apps/tagcache.c	2009-03-04 10:12:54.000000000 -0500
@@ -167,7 +167,7 @@
 /* Variable-length tag entry in tag files. */
 struct tagfile_entry {
     short tag_length;  /* Length of the data in bytes including '\0' */
-    short idx_id;      /* Corresponding entry location in index file of not unique tags */
+    int idx_id;      /* Corresponding entry location in index file of not unique tags */
     char tag_data[0];  /* Begin of the tag data */
 };
 
@@ -192,7 +192,7 @@
 };
 
 /* For the endianess correction */
-static const char *tagfile_entry_ec   = "ss";
+static const char *tagfile_entry_ec   = "ll";
 /**
  Note: This should be (1 + TAG_COUNT) amount of l's.
  */