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>
