diff --git a/options.xhtml b/options.xhtml
index e2a393bd6..33e807f29 100644
--- a/options.xhtml
+++ b/options.xhtml
@@ -41646,7 +41646,15 @@ list of package</p>
  </span>
 </dt>
 <dd>
-<p>Whether to enable keepassxc.</p>
+<p>Whether to enable KeePassXC.</p><div class="note"><h3 class="title">Note</h3><p>When this flag is set, KeePassXC’ builtin native messaging manifest for
+communication with its browser extension is automatically installed.
+This conflicts with KeePassXC’ builtin installation mechanism. To
+prevent error messages, either set
+<code class="option">programs.keepassxc.settings.Browser.UpdateBinaryPath</code> to
+<code class="literal">false</code>, or untick the checkbox</p><p>Application Settings/
+Browser Integration/
+Advanced/
+Update native messaging manifest files at startup</p><p>in the GUI.</p></div>
 
 <p><span class="emphasis"><em>Type:</em></span>
 boolean</p>
@@ -41697,7 +41705,7 @@ null or package</p>
  </span>
 </dt>
 <dd>
-<p>Whether to start Keepassxc automatically on login through the XDG autostart mechanism.</p>
+<p>Whether to start KeePassXC automatically on login through the XDG autostart mechanism.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 boolean</p>