diff -Naur grub-1.99/docs/grub.info grub-1.99-magellan/docs/grub.info
--- grub-1.99/docs/grub.info	2011-05-14 22:59:24.000000000 +0200
+++ grub-1.99-magellan/docs/grub.info	2011-07-02 02:53:35.000000000 +0200
@@ -995,7 +995,7 @@
 Booting::, and *note Shell-like scripting::), and to disable any system
 provided by their distribution to automatically run `grub-mkconfig'.
 
-   The file `/etc/default/grub' controls the operation of
+   The file `/etc/conf.d/grub' controls the operation of
 `grub-mkconfig'.  It is sourced by a shell script, and so must be valid
 POSIX shell input; normally, it will just be a sequence of `KEY=value'
 lines, but if the value contains spaces or other special characters
@@ -1003,7 +1003,7 @@
 
      GRUB_TERMINAL_INPUT="console serial"
 
-   Valid keys in `/etc/default/grub' are as follows:
+   Valid keys in `/etc/conf.d/grub' are as follows:
 
 `GRUB_DEFAULT'
      The default menu entry.  This may be a number, in which case it
@@ -2031,7 +2031,7 @@
 Some laptop vendors provide an additional power-on button which boots
 another OS.  GRUB supports such buttons with the `GRUB_TIMEOUT_BUTTON',
 `GRUB_DEFAULT_BUTTON', `GRUB_HIDDEN_TIMEOUT_BUTTON' and
-`GRUB_BUTTON_CMOS_ADDRESS' variables in default/grub (*note Simple
+`GRUB_BUTTON_CMOS_ADDRESS' variables in conf.d/grub (*note Simple
 configuration::).  `GRUB_TIMEOUT_BUTTON', `GRUB_DEFAULT_BUTTON' and
 `GRUB_HIDDEN_TIMEOUT_BUTTON' are used instead of the corresponding
 variables without the `_BUTTON' suffix when powered on using the special
diff -Naur grub-1.99/docs/grub.texi grub-1.99-magellan/docs/grub.texi
--- grub-1.99/docs/grub.texi	2011-05-14 22:48:59.000000000 +0200
+++ grub-1.99-magellan/docs/grub.texi	2011-07-02 02:52:51.000000000 +0200
@@ -1045,7 +1045,7 @@
 (@pxref{Booting}, and @ref{Shell-like scripting}), and to disable any system
 provided by their distribution to automatically run @command{grub-mkconfig}.
 
-The file @file{/etc/default/grub} controls the operation of
+The file @file{/etc/conf.d/grub} controls the operation of
 @command{grub-mkconfig}.  It is sourced by a shell script, and so must be
 valid POSIX shell input; normally, it will just be a sequence of
 @samp{KEY=value} lines, but if the value contains spaces or other special
@@ -1055,7 +1055,7 @@
 GRUB_TERMINAL_INPUT="console serial"
 @end example
 
-Valid keys in @file{/etc/default/grub} are as follows:
+Valid keys in @file{/etc/conf.d/grub} are as follows:
 
 @table @samp
 @item GRUB_DEFAULT
@@ -2002,7 +2002,7 @@
 Some laptop vendors provide an additional power-on button which boots another
 OS.  GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON},
 @samp{GRUB_DEFAULT_BUTTON}, @samp{GRUB_HIDDEN_TIMEOUT_BUTTON} and
-@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in default/grub (@pxref{Simple
+@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in conf.d/grub (@pxref{Simple
 configuration}).  @samp{GRUB_TIMEOUT_BUTTON}, @samp{GRUB_DEFAULT_BUTTON} and
 @samp{GRUB_HIDDEN_TIMEOUT_BUTTON} are used instead of the corresponding
 variables without the @samp{_BUTTON} suffix when powered on using the special
diff -Naur grub-1.99/util/grub.d/README grub-1.99-magellan/util/grub.d/README
--- grub-1.99/util/grub.d/README	2010-12-01 15:45:43.000000000 +0100
+++ grub-1.99-magellan/util/grub.d/README	2011-07-02 02:48:55.000000000 +0200
@@ -8,4 +8,4 @@
 The number namespace in-between is configurable by system installer and/or
 administrator.  For example, you can add an entry to boot another OS as
 01_otheros, 11_otheros, etc, depending on the position you want it to occupy in
-the menu; and then adjust the default setting via /etc/default/grub.
+the menu; and then adjust the default setting via /etc/conf.d/grub.
diff -Naur grub-1.99/util/grub-install.in grub-1.99-magellan/util/grub-install.in
--- grub-1.99/util/grub-install.in	2011-04-03 15:36:21.000000000 +0200
+++ grub-1.99-magellan/util/grub-install.in	2011-07-02 02:54:55.000000000 +0200
@@ -60,8 +60,8 @@
 efi_quiet=
 
 # Get GRUB_DISTRIBUTOR.
-if test -f "${sysconfdir}/default/grub" ; then
-    . "${sysconfdir}/default/grub"
+if test -f "${sysconfdir}/conf.d/grub" ; then
+    . "${sysconfdir}/conf.d/grub"
 fi
 
 bootloader_id="$(echo "$GRUB_DISTRIBUTOR" | tr 'A-Z' 'a-z' | cut -d' ' -f1)"
diff -Naur grub-1.99/util/grub-mkconfig.in grub-1.99-magellan/util/grub-mkconfig.in
--- grub-1.99/util/grub-mkconfig.in	2011-04-06 17:45:53.000000000 +0200
+++ grub-1.99-magellan/util/grub-mkconfig.in	2011-07-02 02:54:20.000000000 +0200
@@ -152,8 +152,8 @@
 # choosing Hurd filesystem module.
 GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
 
-if test -f ${sysconfdir}/default/grub ; then
-  . ${sysconfdir}/default/grub
+if test -f ${sysconfdir}/conf.d/grub ; then
+  . ${sysconfdir}/conf.d/grub
 fi
 
 # XXX: should this be deprecated at some point?
@@ -272,7 +272,7 @@
 # DO NOT EDIT THIS FILE
 #
 # It is automatically generated by $self using templates
-# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub
+# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/conf.d/grub
 #
 EOF
 
@@ -296,7 +296,7 @@
 if test "x${grub_cfg}" != "x" ; then
   if ! ${grub_script_check} ${grub_cfg}.new; then
     echo "Syntax errors are detected in generated GRUB config file." >&2
-    echo "Ensure that there are no errors in /etc/default/grub" >&2
+    echo "Ensure that there are no errors in /etc/conf.d/grub" >&2
     echo "and /etc/grub.d/* files or please file a bug report with" >&2
     echo "${grub_cfg}.new file attached." >&2
   else