diff -Nuar grub-1.96.orig/util/grub.d/10_linux.in grub-1.96/util/grub.d/10_linux.in
--- grub-1.96.orig/util/grub.d/10_linux.in	2008-02-03 13:11:33.000000000 +0000
+++ grub-1.96/util/grub.d/10_linux.in	2008-02-22 05:55:32.000000000 +0000
@@ -21,7 +21,9 @@
 libdir=@libdir@
 . ${libdir}/grub/update-grub_lib
 
-if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+if [ "x${GRUB_OS}" != "x" ] ; then
+  OS="${GRUB_OS}"
+elif [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU/Linux
 else
   OS="${GRUB_DISTRIBUTOR} GNU/Linux"
@@ -52,8 +54,8 @@
 
 test_gt ()
 {
-  local a=`echo $1 | sed -e "s/vmlinu[zx]-//g"`
-  local b=`echo $2 | sed -e "s/vmlinu[zx]-//g"`
+  local a=`echo $1 | sed -e "s/vmlinu[zx]-//g" -e "s/^kernel-genkernel-[[:alnum:]_]\+-//g"`
+  local b=`echo $2 | sed -e "s/vmlinu[zx]-//g" -e "s/^kernel-genkernel-[[:alnum:]_]\+-//g"`
   local cmp=gt
   if [ "x$b" = "x" ] ; then
     return 0
@@ -78,7 +80,7 @@
   echo "$a"
 }
 
-list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
+list=`for i in {,/boot}/vmlinu[xz]-* {,/boot}/kernel-genkernel-* ; do
         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
       done`
 
@@ -93,7 +95,9 @@
 
   initrd=
   for i in "initrd.img-${version}" "initrd-${version}.img" \
-	   "initrd.img-${alt_version}" "initrd-${alt_version}.img"; do
+	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+	   "initramfs-genkernel-${version}" \
+	   "initramfs-genkernel-${alt_version}" ; do
     if test -e "${dirname}/${i}" ; then
       initrd="$i"
       break
diff -Nuar grub-1.96.orig/util/update-grub.in grub-1.96/util/update-grub.in
--- grub-1.96.orig/util/update-grub.in	2008-02-03 13:11:33.000000000 +0000
+++ grub-1.96/util/update-grub.in	2008-02-22 05:57:00.000000000 +0000
@@ -127,7 +127,7 @@
 export GRUB_DEVICE GRUB_FS GRUB_DRIVE GRUB_DRIVE_BOOT GRUB_DRIVE_BOOT_GRUB GRUB_FONT_PATH GRUB_PRELOAD_MODULES
 
 # These are optional, user-defined variables.
-export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX GRUB_TERMINAL GRUB_SERIAL_COMMAND
+export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_OS GRUB_CMDLINE_LINUX GRUB_TERMINAL GRUB_SERIAL_COMMAND
 
 exec > ${grub_cfg}.new
 chmod 444 ${grub_cfg}.new