Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision b2208110250a9b20aad9af98ee343a9a07b05053)
+++ general/genutils/pinentry.xml	(revision 56b449e5fa2bec0643919dcd2e92f7243d91e9f7)
@@ -7,8 +7,8 @@
   <!ENTITY pinentry-download-http " ">
   <!ENTITY pinentry-download-ftp  "ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-&pinentry-version;.tar.bz2">
-  <!ENTITY pinentry-md5sum        "f51d454f921111b5156a2291cbf70278">
-  <!ENTITY pinentry-size          "488 KB">
-  <!ENTITY pinentry-buildsize     "5.9 MB">
-  <!ENTITY pinentry-time          "less than 0.1 SBU">
+  <!ENTITY pinentry-md5sum        "b81321407466a6263ebbfd34145cd6e8">
+  <!ENTITY pinentry-size          "500 KB">
+  <!ENTITY pinentry-buildsize     "15 MB (with <command>pinentry-qt4</command>)">
+  <!ENTITY pinentry-time          "less than 0.1 SBU (with <command>pinentry-qt4</command>)">
 ]>
 
@@ -87,5 +87,7 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>sed -i 's:ncursesw/::' pinentry/pinentry-curses.c &amp;&amp;
+
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen><!-- &amp;&amp;
 
@@ -122,4 +124,11 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i ... pinentry/pinentry-curses.c</command>: Help
+      <command>configure</command> script to find
+      <application>ncursesw</application> headers -
+      <application>ncursesw</application> is the default in LFS/BLFS.
+    </para>
 
     <para>
@@ -145,8 +154,10 @@
 
       <seglistitem>
-        <seg>pinentry (symlink), pinentry-curses, pinentry-gtk-2,
-          pinentry-qt4, and pinentry-tty</seg>
+        <seg>
+          pinentry (symlink), pinentry-curses, pinentry-gnome3, pinentry-gtk-2,
+          pinentry-qt4, and pinentry-tty
+        </seg>
         <seg>None</seg>
-        <seg>None<!--/usr/share/doc/pinentry-&pinentry-version;--></seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
@@ -178,15 +189,15 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="pinentry-gtk">
-        <term><command>pinentry-gtk</command></term>
-        <listitem>
-          <para> is a <application>GTK+</application> GUI
-          <application>PIN-Entry</application> program.</para>
-          <indexterm zone="pinentry pinentry-gtk">
-            <primary sortas="b-pinentry-gtk">pinentry-gtk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
+
+      <varlistentry id="pinentry-gnome3">
+        <term><command>pinentry-gnome3</command></term>
+        <listitem>
+          <para> is a <application>GNOME-3</application> GUI
+          <application>PIN-Entry</application> program.</para>
+          <indexterm zone="pinentry pinentry-gnome3">
+            <primary sortas="b-pinentry-gnome3">pinentry-gnome3</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="pinentry-gtk-2">
@@ -200,15 +211,4 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="pinentry-qt">
-        <term><command>pinentry-qt</command></term>
-        <listitem>
-          <para> is a <application>Qt3</application> GUI
-          <application>PIN-Entry</application> program.</para>
-          <indexterm zone="pinentry pinentry-qt">
-            <primary sortas="b-pinentry-qt">pinentry-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
 
       <varlistentry id="pinentry-qt4">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision b2208110250a9b20aad9af98ee343a9a07b05053)
+++ introduction/welcome/changelog.xml	(revision 56b449e5fa2bec0643919dcd2e92f7243d91e9f7)
@@ -44,4 +44,14 @@
 
 -->
+
+    <listitem>
+      <para>June 2nd, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to pinentry-0.9.3. Fixes
+          <ulink url="&blfs-ticket-root;6558">#6558</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: packages.ent
===================================================================
--- packages.ent	(revision b2208110250a9b20aad9af98ee343a9a07b05053)
+++ packages.ent	(revision 56b449e5fa2bec0643919dcd2e92f7243d91e9f7)
@@ -196,5 +196,5 @@
 <!ENTITY intltool-version             "0.50.2">
 <!ENTITY lsof-version                 "4.88">
-<!ENTITY pinentry-version             "0.9.2">
+<!ENTITY pinentry-version             "0.9.3">
 <!ENTITY rarian-version               "0.8.1">
 <!ENTITY recode-version               "3.6">
