Index: general.ent
===================================================================
--- general.ent	(revision b3b4d5d927d47fc19fc47ece8363bcc3164bee08)
+++ general.ent	(revision bc00982fe5c1ee4c7e3511cd2200cabafc59c1fe)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "24">                   <!-- Always 2 digits -->
+<!ENTITY day          "29">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
@@ -305,5 +305,5 @@
 <!ENTITY gcc3-version                 "3.3.6">
 <!ENTITY guile-version                "1.8.7">
-<!ENTITY icedtea6-version             "1.9">
+<!ENTITY icedtea6-version             "1.9.4">
 <!ENTITY jdk-version                  "6 Update 18">
 <!ENTITY junit-version                "4.8.1">
Index: general/prog/icedtea6.xml
===================================================================
--- general/prog/icedtea6.xml	(revision b3b4d5d927d47fc19fc47ece8363bcc3164bee08)
+++ general/prog/icedtea6.xml	(revision bc00982fe5c1ee4c7e3511cd2200cabafc59c1fe)
@@ -5,20 +5,28 @@
   %general-entities;
 
-  <!ENTITY icedtea6-download-binary       "http://anduin.linuxfromscratch.org/files/BLFS/icedtea6-&icedtea6-version;-2-i586-bin.tar.bz2">
-  <!ENTITY icedtea6-bin-md5sum            "6f5934057ce9d3bbb6242b2680886eff">
-  <!ENTITY icedtea6-bin-size              "172 MB">
-  <!ENTITY icedtea6-bin-buildsize         "422 MB">
-
-  <!ENTITY icedtea6-source-md5sum        "24191e3974ea58cb2bc410590221486c">
+  <!ENTITY icedtea6-download-binary-x86  "http://anduin.linuxfromscratch.org/files/BLFS/icedtea6-&icedtea6-version;-1-i586-bin.tar.xz">
+  <!ENTITY icedtea6-bin-md5sum-x86       "af76a2b9ad92422a145335cf6c71064c">
+  <!ENTITY icedtea6-bin-size-x86         "100 MB">
+  <!ENTITY icedtea6-bin-buildsize-x86    "844 MB">
+
+<!-- This is not an error, x86 is larger than x86_64 because x86 includes a
+     client VM, whereas one is not available on x86_64 -->
+
+  <!ENTITY icedtea6-download-binary-x64  "http://anduin.linuxfromscratch.org/files/BLFS/icedtea6-&icedtea6-version;-1-x86_64-bin.tar.xz">
+  <!ENTITY icedtea6-bin-md5sum-x64       "75fca6ce52def2bf3cf16bbec7230369">
+  <!ENTITY icedtea6-bin-size-x64         "77 MB">
+  <!ENTITY icedtea6-bin-buildsize-x64    "564 MB">
+
+  <!ENTITY icedtea6-source-md5sum        "d96d950b76a92e8cd327ae55ca4935e1">
   <!ENTITY openjdk-md5sum                "0b36adbf67e4f261e1b827ed4be4f447">
   <!ENTITY jaf-md5sum                    "bc95c133620bd68c161cac9891592901">
   <!ENTITY jaxp-md5sum                   "22e95fbdb9fb7d8b6b6fc0a1d76d1fbd">
   <!ENTITY jaxws-md5sum                  "91adfd41e6f001add4f92ae31216b1e3">
-  <!ENTITY ecj-md5sum                    "68fa8f34c8dbee816ccda37b9296f812">
+  <!ENTITY ecj-md5sum                    "448c6e65234fc61624e14b0964d75bd9">
   <!ENTITY rhino-md5sum                  "40d0a9abec8169e42920214b37fa8e0e">
   <!ENTITY xalan-md5sum                  "99d049717c9d37a930450e630d8a6531">
-  <!ENTITY xerces-md5sum                 "a3aece3feb68be6d319072b85ad06023">
-
-  <!ENTITY icedtea6-source-size          "6.1 MB">
+  <!ENTITY xerces-md5sum                 "408500aaaf1ff9f1e03e79defe90facc">
+
+  <!ENTITY icedtea6-source-size          "6.2 MB">
   <!ENTITY openjdk-size                  "43 MB">
   <!ENTITY jaf-size                      "70 KB">
@@ -28,5 +36,5 @@
   <!ENTITY rhino-size                    "2.9 MB">
   <!ENTITY xalan-size                    "16.8 MB">
-  <!ENTITY xerces-size                   "6.6 MB">
+  <!ENTITY xerces-size                   "7.0 MB">
 
   <!ENTITY icedtea6-src-buildsize         "7 GB">
@@ -40,8 +48,8 @@
   <!ENTITY jaxp-download "http://icedtea.classpath.org/builds/icedtea6/src/drops/jdk6-jaxp-&openjdk-build;.zip">
   <!ENTITY jaxws-download "http://icedtea.classpath.org/builds/icedtea6/src/drops/jdk6-jaxws-&openjdk-build;.zip">
-  <!ENTITY ecj-download "http://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.6-201006080911/ecj-3.6.jar">
+  <!ENTITY ecj-download "http://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.6.1-201009090800/ecj-3.6.1.jar">
   <!ENTITY rhino-download "ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip">
   <!ENTITY xalan-download "http://apache.osuosl.org/xml/xalan-j/xalan-j_2_7_1-bin.zip">
-  <!ENTITY xerces-download "http://apache.osuosl.org/xml/xerces-j/Xerces-J-bin.2.9.0.zip">
+  <!ENTITY xerces-download "http://apache.osuosl.org/xerces/j/Xerces-J-bin.2.11.0.zip">
 
 ]>
@@ -114,22 +122,5 @@
     </note>
 
-    <bridgehead renderas="sect3">Binary Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Binary download: <ulink url="&icedtea6-download-binary;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &icedtea6-bin-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size (binary): &icedtea6-bin-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &icedtea6-bin-buildsize;</para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Source Package Information</bridgehead>
-
     <itemizedlist spacing="compact">
       <listitem>
@@ -186,4 +177,36 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Binary Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Binary download (x86):
+        <ulink url="&icedtea6-download-binary-x86;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &icedtea6-bin-md5sum-x86;</para>
+      </listitem>
+      <listitem>
+        <para>Download size (binary): &icedtea6-bin-size-x86;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &icedtea6-bin-buildsize-x86;</para>
+      </listitem>
+    </itemizedlist>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Binary download (x86_64):
+        <ulink url="&icedtea6-download-binary-x64;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &icedtea6-bin-md5sum-x64;</para>
+      </listitem>
+      <listitem>
+        <para>Download size (binary): &icedtea6-bin-size-x64;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &icedtea6-bin-buildsize-x64;</para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
 
@@ -196,9 +219,13 @@
       <listitem>
         <para><ulink
-        url="&patch-root;/icedtea6-&icedtea6-version;-testsuite_fixes-1.patch"/></para>
+        url="&patch-root;/icedtea6-&icedtea6-version;-generate_cacerts-1.patch"/></para>
       </listitem>
       <listitem>
         <para><ulink
-        url="&patch-root;/icedtea6-&icedtea6-version;-generate_cacerts-1.patch"/></para>
+        url="&patch-root;/icedtea6-&icedtea6-version;-xerces2_10-1.patch"/></para>
+      </listitem>
+      <listitem>
+        <para><ulink
+        url="&patch-root;/icedtea6-&icedtea6-version;-fixed_paths-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -245,4 +272,10 @@
     <bridgehead renderas="sect3">IcedTea6 Dependencies</bridgehead>
 
+<!-- Remove required dependency after BLFS-6.7 -->
+    <bridgehead renderas="sect4">Required Dependencies</bridgehead>
+    <para role="required">
+    <xref linkend="xz-utils"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional Runtime Dependencies (required for
     source installation)</bridgehead>
@@ -251,7 +284,5 @@
     <xref linkend="cups"/>,
     <xref linkend="gtk2"/>, and
-    <ulink url="ftp://ftp.x.org/pub/individual/lib/libXp-1.0.0.tar.bz2">
-    libXp</ulink>
-    <!-- <xref linkend="libXp"/> -->
+    <xref linkend="xorg7-lib"/>
     </para>
 
@@ -276,7 +307,9 @@
     the source version. You can choose to keep either or both.</para>
 
-    <para>Install the binary <application>IcedTea6</application> with the
-    following commands as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <bridgehead renderas="sect3">IcedTea6 Binary Installation</bridgehead>
+    <para>Begin by extracting the appropriate binary tarball and changing to
+    the extracted dirctory. Install the binary
+    <application>IcedTea6</application> with the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>cp -R j2sdk-image /opt/icedtea6-&icedtea6-version;-bin &amp;&amp;
@@ -291,13 +324,16 @@
 export PATH="${PATH}:${JAVA_HOME}/bin"</userinput></screen>
 
-    <para>The binary version is now installed.</para>
-
-    <para>If you don't want to compile the sources, skip ahead to the
-    configuration section.</para>
-
+    <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">IcedTea6 Source Installation</bridgehead>
     <note><para>The source build of IcedTea6 requires
     <xref linkend="apache-ant"/>.  You'll need to build that first to satisfy
     the reciprocal dependency, and return to this section to continue building
     IcedTea6.</para></note>
+
+    <para>Like other packages in BLFS, begin by extracting the
+    <application>IcedTea6</application> source package and changing into the
+    extracted dirctory.</para>
 
     <para><application>IcedTea6</application> requires several freely
@@ -306,5 +342,5 @@
     programs, or remove them if you choose.  You can optionally choose not to
     install them at all, and provide the necessary configure options to find
-    the files.  Install the necessary tools with the following commands as the
+    the files. Install the necessary tools with the following commands as the
     <systemitem class="username">root</systemitem> user:</para>
 
@@ -313,11 +349,11 @@
 unzip ../../rhino1_7R2.zip &amp;&amp;
 unzip ../../xalan-j_2_7_1-bin.zip &amp;&amp;
-unzip ../../Xerces-J-bin.2.9.0.zip &amp;&amp;
+unzip ../../Xerces-J-bin.2.11.0.zip &amp;&amp;
 install -v -d -m755 /usr/share/java &amp;&amp;
 install -v -m755 rhino1_7R2/*.jar /usr/share/java &amp;&amp;
 install -v -m755 xalan-j_2_7_1/*.jar /usr/share/java &amp;&amp;
-install -v -m755 xerces-2_9_0/*.jar /usr/share/java &amp;&amp;
-install -v -m755 ../../ecj-3.6.jar /usr/share/java &amp;&amp;
-ln -s ecj-3.6.jar /usr/share/java/ecj.jar &amp;&amp;
+install -v -m755 xerces-2_11_0/*.jar /usr/share/java &amp;&amp;
+install -v -m755 ../../ecj-3.6.1.jar /usr/share/java &amp;&amp;
+ln -s ecj-3.6.1.jar /usr/share/java/ecj.jar &amp;&amp;
 ln -s xalan.jar /usr/share/java/xalan2.jar &amp;&amp;
 cd .. &amp;&amp;
@@ -340,12 +376,18 @@
 <screen><userinput>patch -Np1 -i ../icedtea6-&icedtea6-version;-upstream_fixes-1.patch</userinput></screen>
 
-    <para>Apply a patch to fix several tests, and disable invalid tests:</para>
-    
-<screen><userinput>patch -Np1 -i ../icedtea6-&icedtea6-version;-testsuite_fixes-1.patch</userinput></screen>
-
     <para>Apply a patch to generate a valid cacerts file using the system CA
     certificates:</para>
 
 <screen><userinput>patch -Np1 -i ../icedtea6-&icedtea6-version;-generate_cacerts-1.patch</userinput></screen>
+
+    <para>Apply a patch to fix the build when using a newer version of
+    Xerces2:</para>
+
+<screen><userinput>patch -Np1 -i ../icedtea6-&icedtea6-version;-xerces2_10-1.patch</userinput></screen>
+
+    <para>Apply a patch to replace fixed paths with ones appropriate for
+    BLFS:</para>
+
+<screen><userinput>patch -Np1 -i ../icedtea6-&icedtea6-version;-fixed_paths-1.patch</userinput></screen>
 
     <para>Configure and build the package with the following commands:</para>
@@ -357,6 +399,9 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.  The
-    testsuite should complete without error.</para>
+    <para>To test the results, issue: <command>make check</command>. The
+    included version of <application>jtreg</application> is old, and the test
+    suite is very dependent on the host system as well. You should expect to
+    see 6 failures and 1 error in the langtools tests, and 20 to 23 failures
+    in jdk with up to 3 errors. The other 4700 tests should pass.</para>
 
     <para>Install the package with the following commands as the
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision b3b4d5d927d47fc19fc47ece8363bcc3164bee08)
+++ introduction/welcome/changelog.xml	(revision bc00982fe5c1ee4c7e3511cd2200cabafc59c1fe)
@@ -41,4 +41,12 @@
 
 -->
+    <listitem>
+      <para>January 29th, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated to IcedTea6-1.9.4.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
