diff --git a/ChangeLog b/ChangeLog
index 4a6fefc15..8a51142a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/completion.c (complete_file): Handle device
+	containing slash.
+	Fix based on patch by Doug Nazar.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	grub-mknetdir script.
diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c
index 1b51dab3a..a1e86adb0 100644
--- a/grub-core/normal/completion.c
+++ b/grub-core/normal/completion.c
@@ -247,7 +247,8 @@ complete_file (void)
       goto fail;
     }
 
-  dir = grub_strchr (current_word, '/');
+  dir = grub_strchr (current_word + (device ? 2 + grub_strlen (device) : 0),
+		     '/');
   last_dir = grub_strrchr (current_word, '/');
   if (dir)
     {