diff --git a/ChangeLog b/ChangeLog
index 72959e665..2eaee5571 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/wildcard.c (make_regex): Escape brackets.
+
 2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/ls.c (grub_cmd_ls): Accept multiple files.
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
index 64e2e3a54..6eab333b3 100644
--- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c
@@ -137,8 +137,10 @@ make_regex (const char *start, const char *end, regex_t *regexp)
 	  break;
 
 	case '.':
+	case '(':
+	case ')':
 	  buffer[i++] = '\\';
-	  buffer[i++] = '.';
+	  buffer[i++] = ch;
 	  break;
 
 	case '*':
@@ -152,6 +154,7 @@ make_regex (const char *start, const char *end, regex_t *regexp)
     }
   buffer[i++] = '$';
   buffer[i] = '\0';
+  grub_dprintf ("expand", "Regexp is %s\n", buffer);
 
   if (regcomp (regexp, buffer, RE_SYNTAX_GNU_AWK))
     {
@@ -224,6 +227,7 @@ match_devices (const regex_t *regexp, int noparts)
     grub_dprintf ("expand", "matching: %s\n", buffer);
     if (regexec (regexp, buffer, 0, 0, 0))
       {
+	grub_dprintf ("expand", "not matched\n");
 	grub_free (buffer);
 	return 0;
       }