diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index da394783a..306bef3c3 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # GRUB is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -98,8 +98,11 @@ if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
 	&& is_path_readable_by_grub $GRUB_THEME; then
     echo "Found theme: $GRUB_THEME" >&2
     prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME`
-    echo "insmod gfxmenu"
-    echo "set theme=(\$root)/`make_system_path_relative_to_its_root $GRUB_THEME`"
+    cat << EOF
+insmod gfxmenu
+set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
+set menuviewer=gfxmenu
+EOF
 fi
     cat << EOF
 fi