Index: basicnet/netprogs/subversion.xml
===================================================================
--- basicnet/netprogs/subversion.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ basicnet/netprogs/subversion.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -125,6 +125,7 @@
 
     <bridgehead renderas="sect4">Optional to Build the Java Bindings</bridgehead>
-    <para role="optional"><xref linkend="jdk"/> or
-    <ulink url="http://www.inet.no/dante/">Dante</ulink> or
+    <para role="optional">One of <xref linkend="icedtea6"/>, 
+    <xref linkend="jdk"/>,
+    <ulink url="http://www.inet.no/dante/">Dante</ulink>, or
     <ulink url="http://oss.software.ibm.com/developerworks/opensource/jikes/">Jikes</ulink>,
     and <xref linkend="junit"/> (to test the Java bindings)</para>
Index: general/genlib/libidn.xml
===================================================================
--- general/genlib/libidn.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ general/genlib/libidn.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -79,6 +79,6 @@
     a Java compiler&mdash;one of (looked for in this order)
     <xref linkend="gcc"/> (for the <command>gcj</command> program),
-    <ulink url="http://jikes.sourceforge.net/">Jikes</ulink> or
-    <xref linkend="jdk"/>,
+    <ulink url="http://jikes.sourceforge.net/">Jikes</ulink>,
+    <xref linkend="icedtea6"/>, or <xref linkend="jdk"/>,
     and a C# compiler&mdash;<ulink
     url="http://www.mono-project.com/Main_Page">Mono</ulink> or
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ general/genutils/graphviz.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -116,5 +116,5 @@
     built),
     <xref linkend="guile"/>,
-    <xref linkend="jdk"/>,
+    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
     <xref linkend="php"/>,
     <xref linkend="python"/>,
Index: general/genutils/pilot-link.xml
===================================================================
--- general/genutils/pilot-link.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ general/genutils/pilot-link.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -71,5 +71,5 @@
     <xref linkend="popt"/>,
     <xref linkend="libusb-compat"/>,
-    <xref linkend="jdk"/>,
+    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
     <xref linkend="tcl"/>,
     <xref linkend="python"/>,
Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ general/prog/gcc.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -39,8 +39,8 @@
     need one of these additional compilers (C and C++ are installed in LFS)
     before you install them. Additionally, there are instructions in the BLFS
-    book to install the Sun Java Development Kit (<xref linkend="jdk"/>),
+    book to install <xref linkend="icedtea6"/> or <xref linkend="jdk"/>),
     which can be used instead of the Java provided by the
-    <application>GCC</application> package. Many consider the Sun JDK to be a
-    more robust Java environment than the one provided by
+    <application>GCC</application> package. Many consider the Oracle JDK to be
+    a more robust Java environment than the one provided by
     <application>GCC</application>.</para>
 
Index: general/prog/junit.xml
===================================================================
--- general/prog/junit.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ general/prog/junit.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -88,6 +88,6 @@
 
     <para>To run the <application>JUnit</application> regression self-tests,
-    you'll need to have <xref linkend="jdk"/> or <ulink
-    url="http://jikes.sourceforge.net/">Jikes</ulink> installed and the
+    you'll need to have <xref linkend="icedtea6"/>, <xref linkend="jdk"/>, or
+    <ulink url="http://jikes.sourceforge.net/">Jikes</ulink> installed and the
     <envar>CLASSPATH</envar> environment variable updated. Then, as an
     unprivileged user, issue:</para>
Index: general/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ general/prog/pdl.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -237,5 +237,5 @@
             <ulink url="&gnome-download-http;/gnome-libs/1.4/">GNOME
             Libraries-1.4</ulink>,
-            <xref linkend="jdk"/>,
+            <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
             <xref linkend="tk"/>,
             <xref linkend="python"/> (with
Index: general/sysutils/apache-ant.xml
===================================================================
--- general/sysutils/apache-ant.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ general/sysutils/apache-ant.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -72,5 +72,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="jdk"/></para>
+    <para role="required"><xref linkend="icedtea6"/> or
+    <xref linkend="jdk"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
Index: gnome/add/java-access-bridge.xml
===================================================================
--- gnome/add/java-access-bridge.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ gnome/add/java-access-bridge.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -63,5 +63,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="at-spi"/> and
-    <xref linkend="jdk"/></para>
+    either <xref linkend="icedtea6"/> or <xref linkend="jdk"/></para>
 
     <para condition="html" role="usernotes">User Notes:
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ introduction/welcome/changelog.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -47,4 +47,7 @@
           <para>[dj] - Added IcedTea6-1.9.</para>
         </listitem>
+        <listitem>
+          <para>[dj] - Updated all jdk links to optionally use IcedTea6.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: kde/add/kdeutils.xml
===================================================================
--- kde/add/kdeutils.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ kde/add/kdeutils.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -92,5 +92,6 @@
     program will require appropriate utilities to handle various archives,
     including <xref linkend="zip"/>, <xref linkend="unzip"/>,
-    <xref linkend="jdk"/> (for the <command>jar</command> program),
+    <xref linkend="icedtea6"/> or <xref linkend="jdk"/> (for the
+    <command>jar</command> program),
     <xref linkend="unrar"/>, <ulink url="http://www.rarlabs.com">rar</ulink>
     (binary only shareware),
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ kde/core/kdebase.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -66,5 +66,5 @@
     <xref linkend="libxml2"/>,
     <xref linkend="openssl"/>, and
-    <xref linkend="jdk"/></para>
+    either <xref linkend="icedtea6"/> or <xref linkend="jdk"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: kde/devel/kdebindings.xml
===================================================================
--- kde/devel/kdebindings.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ kde/devel/kdebindings.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -83,5 +83,5 @@
     <xref linkend="python"/>,
     <xref linkend="ruby"/>,
-    <xref linkend="jdk"/>,
+    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
     <xref linkend="seamonkey"/>,
     <ulink url="http://http://www.riverbankcomputing.co.uk/qscintilla/index.php">QScintilla</ulink>,
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ postlfs/security/cyrus-sasl.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -69,5 +69,5 @@
     <xref linkend="openldap"/>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
-    <xref linkend="jdk"/>,
+    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ pst/printing/cups.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -83,5 +83,5 @@
     <xref linkend="php"/>,
     <xref linkend="python"/>,
-    <xref linkend="jdk"/>,
+    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
     <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
     <ulink url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>,
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ server/databases/db.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -80,5 +80,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="tcl"/>,
-    <xref linkend="jdk"/>, and
+    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>, and
     <ulink url="http://www.gnu.org/software/sharutils/">sharutils</ulink>
     (for the <command>uudecode</command> command)</para>
Index: server/major/openssh.xml
===================================================================
--- server/major/openssh.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ server/major/openssh.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -74,5 +74,5 @@
 
     <bridgehead renderas="sect4">Optional Runtime (Used only to gather entropy)</bridgehead>
-    <para role="optional"><xref linkend="jdk"/>,
+    <para role="optional"><xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
     <xref linkend="net-tools"/>, and
     <xref linkend="sysstat"/>.</para>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ xsoft/graphweb/firefox.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -398,4 +398,12 @@
     /usr/lib/firefox-&firefox-version;/plugins</userinput></screen>
 
+    <para>If you have <xref linkend="icedtea6"/> installed as opposed to the
+    <xref linkend="jdk"/>, create the following link (again as the
+    <systemitem class="username">root</systemitem> user) to use the
+    <application>IcedTea6</application> plugin: </para>
+
+<screen role="root"><userinput>ln -v -s $JAVA_HOME/jre/plugin/i386/IcedTeaPlugin.so \
+    /usr/lib/firefox-&firefox-version;/plugins</userinput></screen>
+
     <para>Some packages install Mozilla plugins into the default system-wide
     directory <filename class='directory'>/usr/lib/mozilla/plugins</filename>.
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision 2c25a568a50bcbfc1471523b6de850d966f35f50)
+++ xsoft/graphweb/seamonkey.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
@@ -473,4 +473,12 @@
     /usr/lib/seamonkey-&seamonkey-version;/plugins</userinput></screen>
 
+    <para>If you have <xref linkend="icedtea6"/> installed as opposed to the
+    <xref linkend="jdk"/>, create the following link (again as the
+    <systemitem class="username">root</systemitem> user) to use the 
+    <application>IcedTea6</application> plugin: </para>
+    
+<screen role="root"><userinput>ln -v -s $JAVA_HOME/jre/plugin/i386/IcedTeaPlugin.so \
+    /usr/lib/seamonkey-&seamonkey-version;/plugins</userinput></screen>
+
     <para>Some packages install SeaMonkey plugins into the default system-wide
     directory <filename class='directory'>/usr/lib/mozilla/plugins</filename>.
