diff --git a/docs/CREDITS b/docs/CREDITS
index 5d3c845cf3..6e04addf01 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -121,3 +121,4 @@ Ray Lambert
 Dave Wiard
 Pieter Bos
 Konstantin Isakov
+Bryan Vandyke
diff --git a/firmware/id3.c b/firmware/id3.c
index 3a8296a8ae..6a13de4e29 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -708,8 +708,12 @@ static void setid3v2title(int fd, struct mp3entry *entry)
                 
                 unicode_munge( ptag, &bytesread );
                 tag = *ptag; 
-                tag[bytesread++] = 0;
-                bufferpos += bytesread;
+                /* remove trailing spaces */
+                while ( bytesread > 0 && isspace(tag[bytesread-1]))
+                    bytesread--;
+                tag[bytesread] = 0;
+                bufferpos += bytesread + 1;
+
                 if( tr->ppFunc )
                     bufferpos = tr->ppFunc(entry, tag, bufferpos);
                 break;