diff --git a/ChangeLog b/ChangeLog
index a8903f0f1..73c33e890 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-24  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* docs/grub.texi (Simple configuration): Document GRUB_ENABLE_CRYPTODISK.
+
 2013-09-24  Andrey Borzenkov <arvidjaar@gmail.com>
 
 	* docs/grub.texi (File name syntax): Document ZFS filenames
diff --git a/docs/grub.texi b/docs/grub.texi
index 575cae02e..2bf0d8b05 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1354,6 +1354,12 @@ Normally, @command{grub-mkconfig} will try to use the external
 systems installed on the same system and generate appropriate menu entries
 for them.  Set this option to @samp{true} to disable this.
 
+@item GRUB_ENABLE_CRYPTODISK
+If set to @samp{y}, @command{grub-mkconfig} and @command{grub-install} will
+check for encrypted disks and generate additional commands needed to access
+them during boot.  Note that in this case unattended boot is not possible
+because GRUB will wait for passphrase to unlock encrypted container.
+
 @item GRUB_INIT_TUNE
 Play a tune on the speaker when GRUB starts.  This is particularly useful
 for users unable to see the screen.  The value of this option is passed