diff --git a/calamares/modules/grubcfg.conf b/calamares/modules/grubcfg.conf
index b354ec3..33c2a72 100644
--- a/calamares/modules/grubcfg.conf
+++ b/calamares/modules/grubcfg.conf
@@ -1,9 +1,15 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Create, overwrite or update /etc/default/grub in the target system.
+#
 # Write lines to /etc/default/grub (in the target system) based
 # on calculated values and the values set in the *defaults* key
 # in this configuration file.
 #
 # Calculated values are:
-#   - GRUB_DISTRIBUTOR,   branding module, *bootloaderEntryName*
+#   - GRUB_DISTRIBUTOR,   branding module, *bootloaderEntryName* (this
+#     string is sanitized, and see also setting *keepDistributor*)
 #   - GRUB_ENABLE_CRYPTODISK, based on the presence of filesystems
 #     that use LUKS
 #   - GRUB_CMDLINE_LINUX_DEFAULT, adding LUKS setup and plymouth
@@ -14,6 +20,17 @@
 # already existed. If set to false, edits the existing file instead.
 overwrite: false
 
+# If set to true, prefer to write files in /etc/default/grub.d/
+# rather than the single file /etc/default/grub. If this is set,
+# Calamares will write /etc/default/grub.d/00Calamares instead.
+prefer_grub_d: false
+
+# If set to true, an **existing** setting for GRUB_DISTRIBUTOR is
+# kept, not updated to the *bootloaderEntryName* from the branding file.
+# Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in
+# some way (e.g. uses shell-command substitution).
+keepDistributor: false
+
 # Default entries to write to /etc/default/grub if it does not exist yet or if
 # we are overwriting it.
 #