diff -Naur grub-1.99/util/grub.d/10_linux.in grub-1.99-magellan/util/grub.d/10_linux.in
--- grub-1.99/util/grub.d/10_linux.in	2011-05-14 22:36:49.000000000 +0200
+++ grub-1.99-magellan/util/grub.d/10_linux.in	2011-07-04 20:21:25.000000000 +0200
@@ -31,7 +31,7 @@
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU/Linux
 else
-  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+  OS="${GRUB_DISTRIBUTOR}"
   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
 fi
 
@@ -66,9 +66,9 @@
   recovery="$3"
   args="$4"
   if ${recovery} ; then
-    title="$(gettext_quoted "%s, with Linux %s (recovery mode)")"
+    title="$(gettext_quoted "%s [ %s ] (recovery mode)")"
   else
-    title="$(gettext_quoted "%s, with Linux %s")"
+    title="$(gettext_quoted "%s [ %s ]")"
   fi
   printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"
   if ! ${recovery} ; then
diff -Naur grub-1.99/util/grub.d/20_linux_xen.in grub-1.99-magellan/util/grub.d/20_linux_xen.in
--- grub-1.99/util/grub.d/20_linux_xen.in	2011-04-13 21:20:29.000000000 +0200
+++ grub-1.99-magellan/util/grub.d/20_linux_xen.in	2011-07-04 20:23:57.000000000 +0200
@@ -31,7 +31,7 @@
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU/Linux
 else
-  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+  OS="${GRUB_DISTRIBUTOR}"
   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
 fi
 
@@ -68,9 +68,9 @@
   args="$5"
   xen_args="$6"
   if ${recovery} ; then
-    title="$(gettext_quoted "%s, with Xen %s and Linux %s (recovery mode)")"
+    title="$(gettext_quoted "%s Xen-%s [ %s ] (recovery mode)")"
   else
-    title="$(gettext_quoted "%s, with Xen %s and Linux %s")"
+    title="$(gettext_quoted "%s Xen-%s [ %s ]")"
   fi
   printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${xen_version}" "${version}"
   if ! ${recovery} ; then