diff --git a/ChangeLog b/ChangeLog
index 26af06ed3..345f8f4cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/wildcard.c (make_regex): Handle @.
+
 2011-08-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-install.in: Move cryptodisk logic to appropriate place.
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
index d2f4347d5..256c07e51 100644
--- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c
@@ -139,6 +139,7 @@ make_regex (const char *start, const char *end, regex_t *regexp)
 	case '.':
 	case '(':
 	case ')':
+	case '@':
 	  buffer[i++] = '\\';
 	  buffer[i++] = ch;
 	  break;