diff --git a/ChangeLog b/ChangeLog
index 88b883028..26af06ed3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-install.in: Move cryptodisk logic to appropriate place.
+
 2011-08-21 Szymon Janc <szymon@janc.net.pl>
 
 	* acinclude.m4: Use AC_LANG_PROGRAM macro to generate source code for
diff --git a/util/grub-install.in b/util/grub-install.in
index f9e1510d1..d11d24421 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -558,11 +558,6 @@ if [ "x${devabstraction_module}" = "x" ] ; then
              
           exit 1
         fi
-	if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then
-	    for uuid in "`"${grub_probe}" --device "${device}" --target=cryptodisk_uuid`"; do
-		echo "cryptomount -u $uuid"
-	    done
-	fi
 
         echo "search.fs_uuid ${uuid} root " >> "${grubdir}/load.cfg"
 	echo 'set prefix=($root)'"${relative_grubdir}" >> "${grubdir}/load.cfg"
@@ -577,6 +572,14 @@ if [ "x${devabstraction_module}" = "x" ] ; then
 	fi
     fi
 else
+    if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then
+	for uuid in "`"${grub_probe}" --device "${grub_device}" --target=cryptodisk_uuid`"; do
+	    echo "cryptomount -u $uuid" >> "${grubdir}/load.cfg"
+	done
+    fi
+
+    config_opt="-c ${grubdir}/load.cfg "
+
     prefix_drive=`"$grub_probe" --device-map="${device_map}" --target=drive --device "${grub_device}"` || exit 1
 fi