diff --git a/basicnet/mailnews/mutt.xml b/basicnet/mailnews/mutt.xml
index d202c1f1c9..515960865b 100644
--- a/basicnet/mailnews/mutt.xml
+++ b/basicnet/mailnews/mutt.xml
@@ -54,7 +54,7 @@
     <bridgehead renderas="sect3">Mutt Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gnupg"/>,
+    <para role="optional"><xref linkend="gnupg"/> or <xref linkend="gnupg2"/>,
     <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
     an <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command),
     <xref linkend="aspell"/>,
diff --git a/general/genutils/imagemagick.xml b/general/genutils/imagemagick.xml
index 805aa48e24..2bb5212685 100644
--- a/general/genutils/imagemagick.xml
+++ b/general/genutils/imagemagick.xml
@@ -105,8 +105,8 @@ xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;">
     <ulink url="http://dmalloc.com/">Dmalloc</ulink>,
     <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink>,
     <ulink url="http://www.gsp.com/support/virtual/email/pgp/">PGP</ulink>
-    or <xref linkend="gnupg"/> (you'll have to do some hacking to use
-    <application>GnuPG</application>),
+    or <xref linkend="gnupg"/> or <xref linkend="gnupg2"/>
+    (you'll have to do some hacking to use <application>GnuPG</application>),
     <xref linkend="sane"/>, and
     <xref linkend="wget"/>
     </para>
diff --git a/introduction/welcome/credits.xml b/introduction/welcome/credits.xml
index 78adc06d8c..e33a9a433c 100644
--- a/introduction/welcome/credits.xml
+++ b/introduction/welcome/credits.xml
@@ -183,6 +183,11 @@
         <emphasis>Jeroen Coumans</emphasis></para>
       </listitem>
 
+      <listitem>
+        <para>Amarok:
+        <emphasis>Robert Daniels</emphasis></para>
+      </listitem>
+
       <listitem>
         <para>UDFtools, Perl modules (initial version) and Bluefish:
         <emphasis>Richard Downing</emphasis></para>
@@ -273,7 +278,8 @@
         additions), Expect, FOP, FreeTTS, FriBidi, GC, GCC (rewrite), GMime,
         gnome-audio, gnome-backgrounds, gnome-menus, gnome-mount,
         gnome-screensaver, gnome-volume-manager, GNOME Doc Utils,
-        GNOME Keyring Manager, GnuCash (version 2), GnuTLS, GOffice, Graphviz,
+        GNOME Keyring Manager, GnuCash (version 2), GnuPG2, GnuTLS, GOffice,
+        Graphviz,
         GStreamer Base Plug-ins, GStreamer Good Plug-ins, GStreamer Ugly
         Plug-ins, HAL, Heimdal, HTML Tidy, icon-naming-utils, ISO Codes,
         JadeTeX, Java Access Bridge, JUnit, K3b, Libassuan, LessTif (rewrite),
diff --git a/kde/add/kdepim.xml b/kde/add/kdepim.xml
index ad8f1f914a..a411b231ea 100644
--- a/kde/add/kdepim.xml
+++ b/kde/add/kdepim.xml
@@ -9,8 +9,6 @@
   <!ENTITY kdepim-size          "13.0 MB">
   <!ENTITY kdepim-buildsize     "290 MB (additional 382 MB for API docs)">
   <!ENTITY kdepim-time          "20.8 SBU (additional 1.6 SBU for API docs)">
-
-  <!ENTITY gnu-org              "http://www.gnupg.org/download/index.html">
 ]>
 
 <sect1 id="kdepim" xreflabel="kdepim-&kde-version;">
@@ -65,19 +63,13 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="libjpeg"/>,
     <xref linkend="libxml2"/>,
-    <xref linkend="gnupg"/>, and
+    <xref linkend="gnupg"/> or <xref linkend="gnupg2"/>, and
     <xref linkend="openssl"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="pilot-link"/>,
-    <ulink url="&gnu-org;#gpgme">GPGME</ulink> (requires
-    <xref linkend="libgcrypt"/> then
-    <xref linkend="pth"/> then
-    <xref linkend="libassuan"/> then
-    <ulink url="&gnu-org;#libksba">Libksba</ulink>,
-    <ulink url="ftp://ftp.gnupg.org/gcrypt/pinentry/">pinentry</ulink>,
-    <ulink url="http://www.opensc.org/">OpenSC</ulink> and then
-    <ulink url="&gnu-org;#gnupg2">GnuPG-1.9.x</ulink>),
+    <ulink url="http://www.gnupg.org/download/index.html#gpgme">GPGME</ulink>
+    (requires <xref linkend="gnupg2"/>),
     <ulink url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>,
     <ulink url="http://www.gnokii.org/">gnokii</ulink>,
       Bluetooth hardware and driver libraries,
diff --git a/xsoft/graphweb/seamonkey.xml b/xsoft/graphweb/seamonkey.xml
index 71735b6668..57eeff6ce4 100644
--- a/xsoft/graphweb/seamonkey.xml
+++ b/xsoft/graphweb/seamonkey.xml
@@ -85,7 +85,8 @@
     allows users to access the authentication and encryption features provided
     by the <application>GnuPG</application> package. The
     <application>Enigmail</application> extension will not operate correctly
-    unless you have <xref linkend="gnupg"/> installed.</para>
+    unless you have <xref linkend="gnupg"/> or <xref linkend="gnupg2"/>
+    installed.</para>
 
     <itemizedlist spacing='compact'>
       <listitem>
diff --git a/xsoft/other/balsa.xml b/xsoft/other/balsa.xml
index 03492fd915..dae6b0c0a2 100644
--- a/xsoft/other/balsa.xml
+++ b/xsoft/other/balsa.xml
@@ -83,9 +83,9 @@
     <ulink url="http://www.sqlite.org/">SQLite</ulink></para>
 
     <bridgehead renderas="sect4">Optional to Build Experimental S/MIME Support</bridgehead>
-    <para role="optional"><xref linkend="libksba"/> then
-    <ulink url="http://www.gnupg.org/download/index.html#gnupg2">GnuPG-2.x.x</ulink> then
-    <ulink url="http://www.gnupg.org/download/index.html#gpgme">GPGME</ulink></para>
+    <para role="optional">
+    <ulink url="http://www.gnupg.org/download/index.html#gpgme">GPGME</ulink>
+    (requires <xref linkend="gnupg2"/>)</para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/balsa"/></para>
@@ -152,8 +152,7 @@ make</userinput></screen>
     (<application>GPGME</application>) is installed.</para>
 
     <para><option>--enable-smime</option>: Use this option to enable S/MIME
-    support if <application>Libksba</application> and
-    <application>GnuPG-2.x.x</application> is installed.</para>
+    support if <application>GnuPG-2.x.x</application> is installed.</para>
 
   </sect2>
 
diff --git a/xsoft/other/thunderbird.xml b/xsoft/other/thunderbird.xml
index 003d749b10..526dbc4e50 100644
--- a/xsoft/other/thunderbird.xml
+++ b/xsoft/other/thunderbird.xml
@@ -65,8 +65,8 @@
     the tarball shown below. The <application>Enigmail</application> extension
     allows users to access the authentication and encryption features provided
     by the <application>GnuPG</application> package. The Enigmail extension
-    will not operate correctly unless you have <xref linkend="gnupg"/>
-    installed.</para>
+    will not operate correctly unless you have <xref linkend="gnupg"/> or
+    <xref linkend="gnupg2"/> installed.</para>
 
     <itemizedlist spacing='compact'>
       <listitem>