Index: general.ent
===================================================================
--- general.ent	(revision c2491b6f683cdc8d573681a0c72b340da63e1c91)
+++ general.ent	(revision 92b134167aa9afcb952d4b865574bff10abf5c8f)
@@ -378,5 +378,5 @@
 <!ENTITY git-version                  "1.8.3.3">
 <!ENTITY guile-version                "2.0.9">
-<!ENTITY icedtea-version              "2.3.3">
+<!ENTITY icedtea-version              "2.4.1">
 <!ENTITY openjdk-version              "1.7.0.40">
 <!ENTITY junit-version                "4.11">
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision c2491b6f683cdc8d573681a0c72b340da63e1c91)
+++ general/prog/openjdk.xml	(revision 92b134167aa9afcb952d4b865574bff10abf5c8f)
@@ -6,46 +6,36 @@
 
   <!ENTITY anduin-download               "http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK-&openjdk-version;">
-  <!ENTITY openjdk-download-binary-x86   "&anduin-download;/OpenJDK-&openjdk-version;-i686-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x86        "d52b7a6b1b0fcc065c661efc22022f86">
-  <!ENTITY openjdk-bin-size-x86          "159 MB">
-  <!ENTITY openjdk-bin-buildsize-x86     "464 MB">
-
-  <!ENTITY openjdk-download-binary-x64   "&anduin-download;/OpenJDK-&openjdk-version;-x86_64-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x64        "d67f23dedd26d8b8fd5c0dd007cd5e37">
-  <!ENTITY openjdk-bin-size-x64          "134 MB">
-  <!ENTITY openjdk-bin-buildsize-x64     "358 MB">
-
   <!ENTITY icedtea-download              "http://icedtea.classpath.org/download/source/icedtea-&icedtea-version;.tar.gz">
 
-  <!ENTITY icedtea-md5sum                "26a514047494c8697bb97eac10d83bae">
-  <!ENTITY icedtea-size                  "4.9 MB">
+  <!ENTITY icedtea-md5sum                "cbdefd7d385c61a457924bfbee87e643">
+  <!ENTITY icedtea-size                  "4.7 MB">
 
   <!ENTITY corba-download                "&anduin-download;/corba.tar.gz">
-  <!ENTITY corba-md5sum                  "be19ef74664ce672417a4ba0f91f3d04">
+  <!ENTITY corba-md5sum                  "b4a1f9a5553f92d285bff3f8076e61dd">
   <!ENTITY corba-size                    "1.4 MB">
 
   <!ENTITY hotspot-download              "&anduin-download;/hotspot.tar.gz">
-  <!ENTITY hotspot-md5sum                "91dec9320e95b0ab8fe00cfb5389d335">
-  <!ENTITY hotspot-size                  "9.2 MB">
+  <!ENTITY hotspot-md5sum                "42bfcd67d4649b3eb30649a010b9ac0a">
+  <!ENTITY hotspot-size                  "9.4 MB">
 
   <!ENTITY jaxp-download                 "&anduin-download;/jaxp.tar.gz">
-  <!ENTITY jaxp-md5sum                   "75c2b17d0e37b1a9aa5d913487b7da98">
+  <!ENTITY jaxp-md5sum                   "38834edb77ed2fd8e8828100deb6e943">
   <!ENTITY jaxp-size                     "3.7 MB">
 
   <!ENTITY jaxws-download                "&anduin-download;/jaxws.tar.gz">
-  <!ENTITY jaxws-md5sum                  "61bdab3bb55e5ab6c12cb3a0daecc199">
+  <!ENTITY jaxws-md5sum                  "1426837479d61010728655315456a3d5">
   <!ENTITY jaxws-size                    "2.7 MB">
 
   <!ENTITY jdk-download                  "&anduin-download;/jdk.tar.gz">
-  <!ENTITY jdk-md5sum                    "a2a793aea6d01d00150a78246a29967a">
+  <!ENTITY jdk-md5sum                    "9e71e7ad6ace7ce629e26088950ec32d">
   <!ENTITY jdk-size                      "43 MB">
 
   <!ENTITY langtools-download            "&anduin-download;/langtools.tar.gz">
-  <!ENTITY langtools-md5sum              "6cc42ee41fd64f531ec4aea256b67495">
+  <!ENTITY langtools-md5sum              "86f728535c6edb7b7ea2d567f2fcff87">
   <!ENTITY langtools-size                "2.3 MB">
 
   <!ENTITY openjdk-download              "&anduin-download;/openjdk.tar.gz">
-  <!ENTITY openjdk-md5sum                "43f1697a104ea383083ef7ce305b4f60">
-  <!ENTITY openjdk-size                  "128 KB">
+  <!ENTITY openjdk-md5sum                "165e07ce440848e437f74851f09cce81">
+  <!ENTITY openjdk-size                  "140 KB">
 
   <!ENTITY rhino-download                "ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R3.zip">
@@ -53,7 +43,6 @@
   <!ENTITY rhino-size                    "4.5 MB">
 
-  <!ENTITY openjdk-buildsize             "5.0-7.2 GB">
+  <!ENTITY openjdk-buildsize             "6.0-9.2 GB">
   <!ENTITY openjdk-time                  "45 SBU (an additional 130 SBU for testsuite)">
-
 ]>
 
@@ -66,5 +55,5 @@
   </sect1info>
 
-  <title>OpenJDK-&openjdk-version;</title>
+  <title>OpenJDK-&openjdk-version;/IcedTea-&icedtea-version;</title>
 
   <indexterm zone="openjdk">
@@ -74,6 +63,4 @@
   <sect2 role="package">
     <title>Introduction to OpenJDK and IcedTea</title>
-
-    <warning><para>Under revison do not use for now.</para></warning>
 
     <para><application>IcedTea</application> provides a build harness for the
@@ -88,5 +75,5 @@
     programs.</para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <note><para>The browser plugin and webstart implementation have been split
@@ -146,5 +133,8 @@
 
     <para>The following may be downladed separately or be done as a
-    part of the <userinput>make</userinput> process.</para>
+    part of the <userinput>make</userinput> process. For convenience 
+    the BLFS editors have made the files available in an LFS website.
+    The files are not distributed with versions, but extracted from
+    the OpenJDK version control system at specified (tagged) points.</para>
 
     <itemizedlist spacing="compact">
@@ -220,36 +210,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Binary Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Binary download (x86):
-        <ulink url="&openjdk-download-binary-x86;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &openjdk-bin-md5sum-x86;</para>
-      </listitem>
-      <listitem>
-        <para>Download size (binary): &openjdk-bin-size-x86;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &openjdk-bin-buildsize-x86;</para>
-      </listitem>
-    </itemizedlist>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Binary download (x86_64):
-        <ulink url="&openjdk-download-binary-x64;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &openjdk-bin-md5sum-x64;</para>
-      </listitem>
-      <listitem>
-        <para>Download size (binary): &openjdk-bin-size-x64;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &openjdk-bin-buildsize-x64;</para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
 
@@ -284,24 +242,20 @@
     <bridgehead renderas="sect3">OpenJDK Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Runtime Dependencies (required for
-    binary installation)</bridgehead>
+    <bridgehead renderas="sect4">Required Dependencies</bridgehead>
     <para role="required">
+      An existing binary ( <xref linkend="java"/> or an earlier built 
+      version of this package,
+      <xref linkend="apache-ant"/>,
       <xref linkend="cacerts"/>,
+      <xref linkend="cpio"/>,
       <xref linkend="cups"/>,
       <xref linkend="gtk3"/>,
       <xref linkend="giflib"/>,
       <xref linkend="nspr"/>,
-      <xref linkend="pulseaudio"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Additional Requirements
-    (for source build, including runtime dependencies)</bridgehead>
-    <para role="optional">
-      <xref linkend="apache-ant"/>,
-      <xref linkend="cpio"/>,
+      <xref linkend="pulseaudio"/>,
       <xref linkend="unzip"/>,
       <xref linkend="wget"/>,
-      <xref linkend="which"/> and
+      <xref linkend="which"/>,
+      <xref linkend="xorg7-lib"/>, and 
       <xref linkend="zip"/>
     </para>
@@ -315,31 +269,7 @@
     <title>Installation of OpenJDK</title>
 
-    <para>The instructions below install both the binary and source versions.
-    You may stop after installing the binary version or continue on installing
-    the source version. You can choose to keep either or both.</para>
-
-    <bridgehead renderas="sect3">OpenJDK Binary Installation</bridgehead>
-    <para>Begin by extracting the appropriate binary tarball and changing to
-    the extracted directory. Install the binary
-    <application>OpenJDK</application> with the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -vdm755 /opt/OpenJDK-&openjdk-version;-bin &amp;&amp;
-mv -v * /opt/OpenJDK-&openjdk-version;-bin         &amp;&amp;
-chown -R root:root /opt/OpenJDK-&openjdk-version;-bin</userinput></screen>
-
-    <para>Configure the temporary <application>OpenJDK</application>
-    installation with the following commands:</para>
-
-<screen><userinput>export CLASSPATH=.:/usr/share/java &amp;&amp;
-export PATH="$PATH:/opt/OpenJDK-&openjdk-version;-bin/bin"</userinput></screen>
-
-    <para>The binary version is now installed. If you don't want to compile the
-    sources, skip ahead to the configuration section.</para>
-
-    <bridgehead renderas="sect3">OpenJDK Source Installation</bridgehead>
-    <note><para>The source build of OpenJDK requires
-    <xref linkend="apache-ant"/>.  You'll need to build that first to satisfy
-    the circular dependency, and return to this section to continue building
+    <note><para>The source build of OpenJDK requires <xref
+    linkend="apache-ant"/>.  You'll need to build that first to satisfy the
+    circular dependency, and return to this section to continue building
     OpenJDK.</para></note>
 
@@ -418,4 +348,12 @@
     (Xvfb). Even still, Disk I/O can cause failures.</para>
 
+<screen><userinput>export DISPLAY=:20     &amp;&amp;
+Xvfb :20 -screen 0 1x1x24 -ac&amp;
+echo $!>  Xvfb.pid     &amp;&amp;
+make -k jtregcheck     &amp;&amp;
+kill -9 `cat Xvfb.pid` &amp;&amp;
+unset DISPLAY          &amp;&amp;
+rm -f Xvfb.pid</userinput></screen>
+
     <para>Install the package with the following commands as the
     <systemitem class="username">root</systemitem> user:</para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c2491b6f683cdc8d573681a0c72b340da63e1c91)
+++ introduction/welcome/changelog.xml	(revision 92b134167aa9afcb952d4b865574bff10abf5c8f)
@@ -48,4 +48,7 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to OpenJDK-1.7.0.40/IcedTea-2.4.1.</para> 
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to JUnit-4.11.</para> 
         </listitem>
