diff --git a/ChangeLog b/ChangeLog
index d21fa1026..eaee6266a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/wildcard.c (match_files): Add a useful dprintf.
+	(wildcard_expand): Don't stop on nonregexp parts after regexp ones since
+	it truncates the output.
+	Reported by: Ximin Luo.
+
 2011-06-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/iso9660.c (grub_iso9660_iterate_dir): Skip . and ..
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
index 32561abe6..45d819a3e 100644
--- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c
@@ -288,6 +288,8 @@ match_files (const char *prefix, const char *suffix, const char *end,
     if (regexec (regexp, name, 0, 0, 0))
       return 0;
 
+    grub_dprintf ("expand", "matched\n");
+
     buffer = grub_xasprintf ("%s%s", dir, name);
     if (! buffer)
       return 1;
@@ -423,8 +425,6 @@ wildcard_expand (const char *s, char ***strs)
   while (*start)
     {
       split_path (start, &noregexop, &regexop);
-      if (noregexop >= regexop) /* no more wildcards */
-	break;
 
       if (make_regex (noregexop, regexop, &regexp))
 	goto fail;