diff --git a/general.ent b/general.ent
index 514966ab94..07a8260f4a 100644
--- a/general.ent
+++ b/general.ent
@@ -276,7 +276,7 @@ $Date$
 <!-- <!ENTITY rman-version                 "3.2"> -->
 <!ENTITY icon-naming-utils-version    "0.8.90">
 <!ENTITY rxvt-unicode-version         "9.07">
-<!ENTITY pinentry-version             "0.7.6">
+<!ENTITY pinentry-version             "0.8.1">
 <!ENTITY gperf-version                "3.0.4">
 <!ENTITY rarian-version               "0.8.1">
 
diff --git a/general/genutils/pinentry.xml b/general/genutils/pinentry.xml
index 2276dee898..3ebf758d9c 100644
--- a/general/genutils/pinentry.xml
+++ b/general/genutils/pinentry.xml
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY pinentry-download-http "&sources-anduin-http;/p/pinentry-&pinentry-version;.tar.gz">
+  <!ENTITY pinentry-download-http " ">
   <!ENTITY pinentry-download-ftp  "ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-&pinentry-version;.tar.gz">
-  <!ENTITY pinentry-md5sum        "5a4f676375fa882009da02013d77210f">
-  <!ENTITY pinentry-size          "464 KB">
-  <!ENTITY pinentry-buildsize     "9 MB">
-  <!ENTITY pinentry-time          "0.1 SBU">
+  <!ENTITY pinentry-md5sum        "81f99904daee5331eb6738408bb024b6">
+  <!ENTITY pinentry-size          "500 KB">
+  <!ENTITY pinentry-buildsize     "3.8 MB">
+  <!ENTITY pinentry-time          "less than 0.1 SBU">
 ]>
 
 <sect1 id="pinentry" xreflabel="PIN-Entry-&pinentry-version;">
@@ -42,7 +42,7 @@
     <application>Gtk+</application>, <application>Gtk+-2</application>,
     and <application>Qt-3</application>.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -79,7 +79,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><!-- <xref linkend="GTK"/>, -->
     <xref linkend="gtk2"/>,
-    <xref linkend="qt"/>, and
+    <xref linkend="qt"/> or <xref linkend="qt4"/>, and
     <xref linkend="libcap2"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -131,12 +131,12 @@ install -v -m644 doc/pinentry.{pdf,ps,dvi} \
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><parameter>--enable-...</parameter>: These two parameters are used to
+<!--
+    <para><parameter>- -enable-...</parameter>: These two parameters are used to
     fix a problem with the <command>configure</command> script if the optional
     dependencies are not installed. If the dependencies are installed, these
     parameters may be omitted.</para>
-
+-->
     <para><parameter>--disable-...</parameter>: These three parameters are used
     to fix a problem with the <command>configure</command> script if the
     optional dependencies are not installed. If the dependencies are installed,
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index b00ad17311..df561c1b9c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>December 7th, 2011</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Updated to pinentry-0.8.1.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Updated to libksba-1.2.0.</para>
         </listitem>