Index: tools/cdmake/cdmake.c =================================================================== --- tools/cdmake/cdmake.c (revision 69696) +++ tools/cdmake/cdmake.c (working copy) @@ -640,12 +640,14 @@ const char *s = filename; char *t = d->name_on_cd; char *n = d->name; + const char *ext; int joliet_length; int filename_counter; filename_counter = 1; + ext = strrchr(s, '.'); while (*s != 0) { - if (*s == '.') + if (s == ext) { s++; break;