Index: general.ent
===================================================================
--- general.ent	(revision 14b8417ec9cfbd9933ea359a0da7559552abf7a5)
+++ general.ent	(revision 2af0daa754822911f2f505018bf6134e2abb0172)
@@ -79,5 +79,5 @@
 <!ENTITY iptables-version             "1.3.8">
 <!ENTITY gnupg-version                "1.4.9">
-<!ENTITY gnupg2-version               "2.0.8">
+<!ENTITY gnupg2-version               "2.0.12">
 <!ENTITY tripwire-version             "2.4.1.2">
 <!ENTITY heimdal-version              "1.1">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 14b8417ec9cfbd9933ea359a0da7559552abf7a5)
+++ introduction/welcome/changelog.xml	(revision 2af0daa754822911f2f505018bf6134e2abb0172)
@@ -45,4 +45,7 @@
       <itemizedlist>
         <listitem>
+          <para>[gdalziel] - Updated to GnuPG-2.0.12.</para>
+        </listitem>
+        <listitem>
           <para>[gdalziel] - Updated to pinentry-0.7.6.</para>
         </listitem>
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision 14b8417ec9cfbd9933ea359a0da7559552abf7a5)
+++ postlfs/security/gnupg2.xml	(revision 2af0daa754822911f2f505018bf6134e2abb0172)
@@ -6,10 +6,9 @@
 
   <!ENTITY gnupg2-download-http "&sources-anduin-http;/g/gnupg-&gnupg2-version;.tar.bz2">
-  <!-- <!ENTITY gnupg2-download-http "http://public.ftp.planetmirror.com/pub/gnupg/gnupg-&gnupg2-version;.tar.bz2"> -->
   <!ENTITY gnupg2-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg2-version;.tar.bz2">
-  <!ENTITY gnupg2-md5sum        "fc4377ca67e1bf687eeaf22e79c0b9d1">
-  <!ENTITY gnupg2-size          "3.6 MB">
-  <!ENTITY gnupg2-buildsize     "65 MB">
-  <!ENTITY gnupg2-time          "0.7 SBU">
+  <!ENTITY gnupg2-md5sum        "4718d8a8cd3eac100951d8b162cf537b">
+  <!ENTITY gnupg2-size          "3.8 MB">
+  <!ENTITY gnupg2-buildsize     "60 MB">
+  <!ENTITY gnupg2-time          "0.5 SBU">
 ]>
 
@@ -74,19 +73,17 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="pth"/>,
-    <xref linkend="libassuan"/>,
-    <xref linkend="libgcrypt"/>, and
-    <xref linkend="libksba"/></para>
+    <para role="required"><xref linkend="pth"/>, <xref linkend="libassuan"/>, 
+    <xref linkend="libgcrypt"/>, and <xref linkend="libksba"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="pinentry"/> (Run-time Requirement For Most of
+    the Package's Functionality)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openldap"/>,
-    <xref linkend="libusb-compat"/>,
-    <xref linkend="curl"/>, and
-    an <xref linkend="server-mail"/></para>
-
-    <bridgehead renderas="sect4">Optional (Run-time Requirement For Most of
-    the Package's Functionality)</bridgehead>
-    <para role="optional"><xref linkend="pinentry"/></para>
-
+    <para role="optional"><xref linkend="openldap"/>, 
+    <xref linkend="libusb-compat"/>, <xref linkend="curl"/>,
+    <ulink url="http://www.chiark.greenend.org.uk/~ian/adns/">GNU
+    adns</ulink>, and an <xref linkend="server-mail"/></para>
+ 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gnupg2"/></para>
@@ -100,5 +97,7 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/gnupg2 &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \ 
+            --libexecdir=/usr/lib/gnupg2 \
+            --docdir=/usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
 make</userinput></screen>
 
@@ -107,6 +106,7 @@
 
 <screen><userinput>make -C doc pdf ps html &amp;&amp;
-makeinfo --html --no-split -o doc/gnupg_nochunks.html doc/gnupg.texi &amp;&amp;
-makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi</userinput></screen>
+makeinfo --html --no-split -o doc/gnupg_nochunks.html \
+                              doc/gnupg.texi &amp;&amp;
+makeinfo --plaintext -o doc/gnupg.txt doc/gnupg.texi</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -121,5 +121,9 @@
     -->
 
-<screen role="root"><userinput>make install &amp;&amp;
+<screen role="root"><userinput>make install</userinput></screen>
+
+<!-- Documentation is installed by default -->
+
+<!-- <screen role="root"><userinput>make install &amp;&amp;
 
 install -v -m755 -d         /usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
@@ -128,5 +132,5 @@
 
 install -v -m644 doc/{DETAILS,KEYSERVER,OpenPGP,TRANSLATE} \
-                            /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
+                 /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen> -->
 
     <para>If you created alternate formats of the documentation, install it
@@ -134,13 +138,13 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/gnupg-&gnupg2-version;/html       &amp;&amp;
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/gnupg-&gnupg2-version;/html &amp;&amp;
 install -v -m644 doc/gnupg.html/* \
-                    /usr/share/doc/gnupg-&gnupg2-version;/html       &amp;&amp;
+                 /usr/share/doc/gnupg-&gnupg2-version;/html &amp;&amp;
 install -v -m644 doc/gnupg_nochunks.html \
-                    /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &amp;&amp;
+                 /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &amp;&amp;
 install -v -m644 doc/*.texi \
-                    /usr/share/doc/gnupg-&gnupg2-version;            &amp;&amp;
+                 /usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
 install -v -m644 doc/gnupg.{pdf,dvi,ps,txt} \
-                    /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
+                 /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
 
   </sect2>
@@ -153,4 +157,11 @@
     <filename class="directory">/usr/lib</filename> instead of
     <filename class="directory">/usr/libexec</filename>.</para>
+
+    <para><parameter>--docdir=/usr/share/doc/gnupg-&gnupg2-version;</parameter>: 
+    This switch changes the default docdir to <filename
+    class="directory">/usr/share/doc/gnupg-&gnupg2-version;</filename>.</para>
+
+    <para><parameter>--enable-symcryptrun</parameter>: This switch enables 
+    building the symcryptrun program, a simple symmetric encryption tool.</para>
 
     <!-- See above why this is no longer included
@@ -174,8 +185,8 @@
         <seg>addgnupghome, applygnupgdefaults, gpg-agent, gpg-connect-agent,
         gpg2, gpgconf, gpgkey2ssh, gpgparsemail, gpgsm, gpgsm-gencert.sh,
-        gpgv2, kbxutil, scdaemon, symcryptrun, and watchgnupg</seg>
+        gpgv2, kbxutil, scdaemon, and watchgnupg</seg>
         <seg>None</seg>
         <seg>/usr/lib/gnupg2, /usr/share/gnupg and
-        /usr/share/doc/gnupg2-&gnupg2-version;</seg>
+        /usr/share/doc/gnupg-&gnupg2-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -325,14 +336,4 @@
       </varlistentry>
 
-      <varlistentry id="symcryptrun">
-        <term><command>symcryptrun</command></term>
-        <listitem>
-          <para>is a simple symmetric encryption tool.</para>
-          <indexterm zone="gnupg2 symcryptrun">
-            <primary sortas="b-symcryptrun">symcryptrun</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="watchgnupg">
         <term><command>watchgnupg</command></term>
