diff --git a/ChangeLog b/ChangeLog
index c45413c1c..9efd2c724 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* docs/grub.texi (Unicode): Mention identifier and space limitations.
+
 2012-01-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/jfs.c (grub_jfs_sblock): Make volname a char array.
diff --git a/docs/grub.texi b/docs/grub.texi
index 3d46e018d..2441b2eed 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -4006,6 +4006,14 @@ IEEE1275 aliases are matched case-insensitively except non-ASCII which is
 matched as binary. Similar behaviour is for matching OSBundleRequired.
 Since IEEE1275 aliases and OSBundleRequired don't contain any non-ASCII it
 should never be a problem in practice.
+Case-sensitive identifiers are matched as raw strings, no canonical
+equivalence check is performed. Case-insenstive identifiers are matched
+as RAW but additionally [a-z] is equivalent to [A-Z]. GRUB-defined
+identifiers use only ASCII and so should user-defined ones.
+Identifiers containing non-ASCII may work but aren't supported.
+Only the ASCII space characters (space U+0020, tab U+000b, CR U+000d and
+LF U+000a) are recognised. Other unicode space characters aren't a valid
+field separator.
 
 @node Security
 @chapter Authentication and authorisation