diff --git a/ChangeLog b/ChangeLog
index fbfe0ef6a..509870f95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* fs/iso9660.c (grub_iso9660_iterate_dir): Strip version from joliet
+	filename.
+	Reported by: Georgy Buranov
+
 2010-02-20  Carles Pina i Estany  <carles@pina.cat>
 
 	* util/grub-mkrawimage.c (usage): Change string formatting to
diff --git a/fs/iso9660.c b/fs/iso9660.c
index cadfbba2b..6dc465f25 100644
--- a/fs/iso9660.c
+++ b/fs/iso9660.c
@@ -629,12 +629,16 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
 
         if (dir->data->joliet)
           {
-            char *oldname;
+            char *oldname, *semicolon;
 
             oldname = filename;
             filename = grub_iso9660_convert_string
                   ((grub_uint16_t *) oldname, dirent.namelen >> 1);
 
+	    semicolon = grub_strrchr (filename, ';');
+	    if (semicolon)
+	      *semicolon = '\0';
+
             if (filename_alloc)
               grub_free (oldname);