diff --git a/options.xhtml b/options.xhtml
index 0e3e5d592..de6780e9a 100644
--- a/options.xhtml
+++ b/options.xhtml
@@ -38886,7 +38886,7 @@ null or (JSON value)</p>
 <p><span class="emphasis"><em>Example:</em></span></p><pre><code class="programlisting">{
   email = &quot;name@example.com&quot;;
   lock_timeout = 300;
-  pinentry = &quot;gnome3&quot;;
+  pinentry = pkgs.pinentry-gnome3;
 }
 
 </code></pre>
@@ -39016,17 +39016,16 @@ unsigned integer, meaning &gt;=0</p>
 <code class="literal">pinentry-gnome3</code> may not work on non-Gnome
 systems. You can fix it by adding the following to your
 system configuration:</p><pre><code class="programlisting nix">services.dbus.packages = [ pkgs.gcr ];
-</code></pre><p>For this reason, the default is <code class="literal">gtk2</code> for
-now.</p>
+</code></pre>
 
 <p><span class="emphasis"><em>Type:</em></span>
-package or one of “curses”, “gtk2”, “gnome2”, “qt”, “emacs”</p>
+null or package</p>
 
 <p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">&quot;gtk2&quot;</code></p>
+<code class="literal">null</code></p>
 
 <p><span class="emphasis"><em>Example:</em></span>
-<code class="literal">&quot;gnome3&quot;</code></p>
+<code class="literal">pkgs.pinentry-gnome3</code></p>
 
 <p><span class="emphasis"><em>Declared by:</em></span></p>
 <table border="0" summary="Simple list" class="simplelist">
@@ -58080,7 +58079,7 @@ null or signed integer</p>
 </dd>
 <dt>
  <span class="term">
- <a id="opt-services.gpg-agent.pinentryFlavor"></a><a class="term" href="options.xhtml#opt-services.gpg-agent.pinentryFlavor"><code class="option">services.gpg-agent.pinentryFlavor</code>
+ <a id="opt-services.gpg-agent.pinentryPackage"></a><a class="term" href="options.xhtml#opt-services.gpg-agent.pinentryPackage"><code class="option">services.gpg-agent.pinentryPackage</code>
   </a>
  </span>
 </dt>
@@ -58095,13 +58094,13 @@ system configuration:</p><pre><code class="programlisting nix">services.dbus.pac
 </code></pre>
 
 <p><span class="emphasis"><em>Type:</em></span>
-null or one of “curses”, “gtk2”, “gnome2”, “qt”, “emacs”</p>
+null or package</p>
 
 <p><span class="emphasis"><em>Default:</em></span>
 <code class="literal">null</code></p>
 
 <p><span class="emphasis"><em>Example:</em></span>
-<code class="literal">&quot;gnome3&quot;</code></p>
+<code class="literal">pkgs.pinentry-gnome3</code></p>
 
 <p><span class="emphasis"><em>Declared by:</em></span></p>
 <table border="0" summary="Simple list" class="simplelist">