diff --git a/ChangeLog b/ChangeLog
index cbc8ff331..0b77ea6a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Load fonts and modules for gfxmenu in grub-mkconfig.
+	Idea by: Mario Vasquez
+
+	* util/grub.d/00_header.in: Load pf2 and image modules.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	grub-mkconfig multiple terminal support.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 81f7a213a..f99010d6d 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -98,6 +98,32 @@ EOF
 	prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/  /"
 	cat << EOF
   insmod gfxmenu
+EOF
+	themedir="`dirname $GRUB_THEME`"
+	for x in "$themedir"/*.pf2 "$themedir"/f/*.pf2; do
+	    if [ -f "$x" ]; then
+		cat << EOF
+  loadfont (\$root)`make_system_path_relative_to_its_root $x`
+EOF
+	    fi
+	done
+	if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ]; then
+	    cat << EOF
+  insmod jpeg
+EOF
+	fi
+	if [ x"`echo "$themedir"/*.png`" != x"$themedir/*.png" ]; then
+	    cat << EOF
+  insmod png
+EOF
+	fi
+	if [ x"`echo "$themedir"/*.tga`" != x"$themedir/*.tga" ]; then
+	    cat << EOF
+  insmod tga
+EOF
+	fi
+	    
+	cat << EOF
   set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
 EOF
     fi