diff --git a/ChangeLog b/ChangeLog
index 4e35d2bd5..1a64aa80c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkstandalone.in: Fix modules directory.
+
 2012-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkimage.c (image_targets): Set default_compression to lzma
diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in
index 02a52978c..60c0fe06a 100644
--- a/util/grub-mkstandalone.in
+++ b/util/grub-mkstandalone.in
@@ -154,6 +154,8 @@ if [ "x$source_directory" = x ] ; then
     source_directory="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/$cpu-$platform"
 fi
 
+. "${source_directory}"/modinfo.sh
+
 set $grub_mkimage dummy
 if test -f "$1"; then
     :
@@ -163,17 +165,17 @@ else
 fi
 
 memdisk_dir="`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
-mkdir -p "${memdisk_dir}"/boot/grub
+mkdir -p "${memdisk_dir}"/boot/grub/"${grub_modinfo_target_cpu}-${grub_modinfo_platform}"
 
 for file in "${source_directory}/"*.mod "${source_directory}/"efiemu32.o "${source_directory}/"efiemu64.o; do
     if test -f "$file"; then
-        cp -f "$file" "${memdisk_dir}"/boot/grub/
+        cp -f "$file" "${memdisk_dir}"/boot/grub/"${grub_modinfo_target_cpu}-${grub_modinfo_platform}"
     fi
 done
 
 for file in ${pkglib_DATA}; do
     if test -f "${source_directory}/${file}"; then
-        cp -f "${source_directory}/${file}" "${memdisk_dir}"/boot/grub/
+        cp -f "${source_directory}/${file}" "${memdisk_dir}"/boot/grub/"${grub_modinfo_target_cpu}-${grub_modinfo_platform}"
     fi
 done