diff --git a/ChangeLog b/ChangeLog
index d303b1084..14feffd3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/jfs.c (grub_jfs_find_file): Handle multiple slashes in
+	filename.
+
 2012-05-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/bfs.c (find_in_b_tree) [MODE_AFS]: Fix handling of exact
diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c
index d3de33901..57ffab8fe 100644
--- a/grub-core/fs/jfs.c
+++ b/grub-core/fs/jfs.c
@@ -699,7 +699,7 @@ grub_jfs_find_file (struct grub_jfs_data *data, const char *path,
 
 	  name = next;
 	  next = grub_strchr (name, '/');
-	  if (next)
+	  while (next && *next == '/')
 	    {
 	      next[0] = '\0';
 	      next++;