diff --git a/CHANGES.md b/CHANGES.md
index ca9c56c2..5e79079e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,9 @@ This file describes changes in the AutoDoc package.
     slips by GAPDoc; so it caused no problems in practice, but the resulting XML
     was strictly speaking invalid)
   - Predefine entities `VERSION`, `RELEASEYEAR`, `RELEASEDATE`
+  - Allow specifying scaffold settings *simultaneously* in `PackageInfo.g`
+    and `makedoc.g`; the records are merged, with values from `makedoc.g`
+    taken precedence if e.g. the same entity is defined in both places
 
 2025.10.16
   - Make handling `Date` in `PackageInfo.g` more strict (previously some
diff --git a/gap/Magic.gi b/gap/Magic.gi
index 8b451428..293a6882 100644
--- a/gap/Magic.gi
+++ b/gap/Magic.gi
@@ -215,7 +215,7 @@ function( arg )
     if IsBound(scaffold) and IsBound( pkginfo.AutoDoc ) then
         for key in RecNames( pkginfo.AutoDoc ) do
             if IsBound( scaffold.(key) ) then
-                Info(InfoAutoDoc, 1, "WARNING: ", key, " specified in both PackageInfo.AutoDoc and opt.scaffold");
+                AUTODOC_MergeRecords( scaffold.(key), pkginfo.AutoDoc.(key) );
             else
                 scaffold.(key) := pkginfo.AutoDoc.(key);
             fi;