Index: general.ent
===================================================================
--- general.ent	(revision 5e628466ab8922f3db6503e46d2ce468b5e04893)
+++ general.ent	(revision f533b0df7c600cc7158dad8c6d8000eaf6f83a4b)
@@ -397,6 +397,6 @@
 <!ENTITY git-version                  "1.7.12.1">
 <!ENTITY guile-version                "2.0.6">
-<!ENTITY icedtea-version              "2.2.1">
-<!ENTITY openjdk-version              "1.7.0.5">
+<!ENTITY icedtea-version              "2.2.3">
+<!ENTITY openjdk-version              "1.7.0.9">
 <!ENTITY junit-version                "4.10">
 <!ENTITY librep-version               "0.90.5">
Index: general/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision 5e628466ab8922f3db6503e46d2ce468b5e04893)
+++ general/graphlib/aalib.xml	(revision f533b0df7c600cc7158dad8c6d8000eaf6f83a4b)
@@ -71,4 +71,8 @@
   <sect2 role="installation">
     <title>Installation of AAlib</title>
+
+    <para>Fix a minor problem with the included m4 file:</para>
+
+<screen><userinput>sed -i -e '/AM_PATH_AALIB,/s/AM_PATH_AALIB/[&amp;]/' aalib.m4</userinput></screen>
 
     <para>Install <application>AAlib</application> by running the following
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision 5e628466ab8922f3db6503e46d2ce468b5e04893)
+++ general/prog/openjdk.xml	(revision f533b0df7c600cc7158dad8c6d8000eaf6f83a4b)
@@ -7,45 +7,45 @@
   <!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        "63d68101ae594ef7b1c0efb2803a502c">
-  <!ENTITY openjdk-bin-size-x86          "81 MB">
-  <!ENTITY openjdk-bin-buildsize-x86     "251 MB">
+  <!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        "f9f36dda980dc57b3ccc11c614806b51">
-  <!ENTITY openjdk-bin-size-x64          "113 MB">
-  <!ENTITY openjdk-bin-buildsize-x64     "426 MB">
+  <!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                "a104417178a1e5d10f28a3b03cb75f6c">
-  <!ENTITY icedtea-size                  "4.6 MB">
+  <!ENTITY icedtea-md5sum                "26a514047494c8697bb97eac10d83bae">
+  <!ENTITY icedtea-size                  "4.9 MB">
 
   <!ENTITY corba-download                "&anduin-download;/corba.tar.gz">
-  <!ENTITY corba-md5sum                  "3982a7f60ec9868f8c38fb62febf6d0c">
+  <!ENTITY corba-md5sum                  "be19ef74664ce672417a4ba0f91f3d04">
   <!ENTITY corba-size                    "1.4 MB">
 
   <!ENTITY hotspot-download              "&anduin-download;/hotspot.tar.gz">
-  <!ENTITY hotspot-md5sum                "3015a4b7815db10d08ab434cb67717a7">
-  <!ENTITY hotspot-size                  "9.0 MB">
+  <!ENTITY hotspot-md5sum                "91dec9320e95b0ab8fe00cfb5389d335">
+  <!ENTITY hotspot-size                  "9.2 MB">
 
   <!ENTITY jaxp-download                 "&anduin-download;/jaxp.tar.gz">
-  <!ENTITY jaxp-md5sum                   "c50d0a06b467eec3a0e9730aeedece90">
-  <!ENTITY jaxp-size                     "3.8 MB">
+  <!ENTITY jaxp-md5sum                   "75c2b17d0e37b1a9aa5d913487b7da98">
+  <!ENTITY jaxp-size                     "3.7 MB">
 
   <!ENTITY jaxws-download                "&anduin-download;/jaxws.tar.gz">
-  <!ENTITY jaxws-md5sum                  "e34277dfd57f5029074e390928f21391">
+  <!ENTITY jaxws-md5sum                  "61bdab3bb55e5ab6c12cb3a0daecc199">
   <!ENTITY jaxws-size                    "2.7 MB">
 
   <!ENTITY jdk-download                  "&anduin-download;/jdk.tar.gz">
-  <!ENTITY jdk-md5sum                    "aae87792464b75cf00aa7cad5d22c124">
+  <!ENTITY jdk-md5sum                    "a2a793aea6d01d00150a78246a29967a">
   <!ENTITY jdk-size                      "43 MB">
 
   <!ENTITY langtools-download            "&anduin-download;/langtools.tar.gz">
-  <!ENTITY langtools-md5sum              "92869b3de78b071cb74b75447590373a">
+  <!ENTITY langtools-md5sum              "6cc42ee41fd64f531ec4aea256b67495">
   <!ENTITY langtools-size                "2.3 MB">
 
   <!ENTITY openjdk-download              "&anduin-download;/openjdk.tar.gz">
-  <!ENTITY openjdk-md5sum                "361f22404d494dcd80013b4304589bb0">
-  <!ENTITY openjdk-size                  "132 KB">
+  <!ENTITY openjdk-md5sum                "43f1697a104ea383083ef7ce305b4f60">
+  <!ENTITY openjdk-size                  "128 KB">
 
   <!ENTITY rhino-download                "ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R3.zip">
@@ -76,5 +76,5 @@
 
     <para><application>IcedTea</application> provides a build harness for the
-    <application>OpenJDK</application> package, Oracle's recently open-sourced
+    <application>OpenJDK</application> package, Oracle's open-sourced
     <application>Java</application> development environment.  In order to
     provide a completely free runtime environment, similar to Oracle's closed
@@ -86,5 +86,5 @@
     programs.</para>
 
-    &lfs71_checked;
+    &lfs72_checked;
 
     <note><para>The browser plugin and webstart implementation have been split
@@ -141,4 +141,10 @@
         </para>
       </listitem>
+    </itemizedlist>
+
+    <para>The following may be downladed separately or be done as a 
+    part of the <userinput>make</userinput> process.</para>
+
+    <itemizedlist spacing="compact">
       <listitem>
         <para>Corba Source
@@ -283,8 +289,7 @@
       <xref linkend="gtk3"/>,
       <xref linkend="giflib"/>,
-      <xref linkend="libXp"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="xorg7-lib"/> and
-      <xref linkend="xulrunner"/>.
+      <xref linkend="nspr"/>.
     </para>
 
@@ -295,4 +300,5 @@
     <xref linkend="cpio"/>,
     <xref linkend="unzip"/>,
+    <xref linkend="wget"/>,
     <xref linkend="which"/>, and
     <xref linkend="zip"/></para>
@@ -323,8 +329,6 @@
     installation with the following commands:</para>
 
-<screen><userinput>export PATH_HOLD="${PATH}"                  &amp;&amp;
-export JAVA_HOME="/opt/OpenJDK-&openjdk-version;-bin" &amp;&amp;
-export CLASSPATH=".:/usr/share/java"        &amp;&amp;
-export PATH="${PATH}:${JAVA_HOME}/bin"</userinput></screen>
+<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
@@ -334,5 +338,5 @@
     <note><para>The source build of OpenJDK 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
+    the circular dependency, and return to this section to continue building
     OpenJDK.</para></note>
 
@@ -356,6 +360,6 @@
     composed of several individual projects of the proprietary
     <application>JDK</application> that have been relicensed under an open
-    source license.  Put all of the individual components into the source tree
-    with the following commands:</para>
+    source license.  If you have already downoaded all of the individual 
+    components, place them into the source tree with the following commands:</para>
 
 <screen><userinput>cp -v ../corba.tar.gz     . &amp;&amp;
@@ -391,25 +395,29 @@
 make</userinput></screen>
 
+    <note><para>If you have not installed the tarballs specified above, 
+    they will be automatically downloaded here.</para></note>
+
     <para>To test the results, issue: <command>make jtregcheck</command>. The
     included version of <application>jtreg</application> is old, and the test
     suite is also very dependent on the host system and the environment that it
-    is run in. You should expect to see anywhere between a clean set of tests
-    and up to 160 failures in jdk with up to 17 errors in the tests themselves.
-    The majority of the 6000+ tests should pass. The reason for the
-    greatly varying results is due to how stringent the testing environment
-    must be. Varying architectures, different versions of dependent
-    libraries, unexpected X Window environment and window managers, the CA
-    certificates used to generate the <filename>cacerts</filename> file, and
-    even any user input or power management or screen saver interruptions during
-    the testing can lead to various failures. While the known broken tests have
-    been removed, with the fix_tests patch above, the graphics tests failures
-    cannot be pre-determined (short of removing them all). Best bet for a
-    completely clean result is to run the test suite in a framebuffer on a
-    different screen (Xvfb). Even still, Disk I/O can cause failures.</para>
+    is run in. You should expect to see anywhere between 40 and 100 failures in
+    jdk with up to 10 errors in the tests themselves.  The majority of the
+    6000+ tests should pass. The reason for the greatly varying results is due
+    to how stringent the testing environment must be. Varying architectures,
+    different versions of dependent libraries, unexpected X Window environment
+    and window managers, the CA certificates used to generate the
+    <filename>cacerts</filename> file, and even any user input or power
+    management or screen saver interruptions during the testing can lead to
+    various failures. While the known broken tests have been removed, with the
+    fix_tests patch above, the graphics tests failures cannot be pre-determined
+    (short of removing them all). The best bet for the minimal number of
+    failures is to run the test suite in a framebuffer on a different screen
+    (Xvfb). Even still, Disk I/O can cause failures.</para>
 
     <para>Install the package with the following commands as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>cp -R openjdk.build/j2sdk-image /opt/OpenJDK-&openjdk-version; &amp;&amp;
+<screen role="root"><userinput>chmod 0644 openjdk.build/j2sdk-image/lib/sa-jdi.jar  &amp;&amp;
+cp -R openjdk.build/j2sdk-image /opt/OpenJDK-&openjdk-version; &amp;&amp;
 chown -R root:root /opt/OpenJDK-&openjdk-version;</userinput></screen>
 
@@ -425,8 +433,4 @@
     <para><parameter>--with-jdk-home</parameter>: This switch provides the
     location of the temporary <application>JDK</application>.</para>
-
-    <para><parameter>--enable-nss</parameter>: This switch enables the 
-    build to utilize additional cryptography supplied by the nss
-    libraries.</para>
 
     <para><parameter>--enable-pulse-java</parameter>: This switch enables
@@ -434,4 +438,7 @@
     implementation that is reasonably compatible with the proprietary
     JDK).</para>
+
+    <para><command>chmod -v 0644 ...sa-jdi.jar</command>: Fix permissions
+    in a generated file so all users can access it.</para>
 
   </sect2>
@@ -449,15 +456,16 @@
       the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>ln -v -nsf OpenJDK-&openjdk-version;-bin /opt/OpenJDK</userinput></screen>
-
-    <para>The information below assumes your system is set up using the
-    instructions found in
-    <quote><xref linkend="postlfs-config-profile"/></quote>. You may need to
-    extract the relevant information below and incorporate it into your
-    system's startup files if your system is set up differently.</para>
-
-    <para>Add the following <filename>openjdk.sh</filename> shell startup file
-    to the <filename>/etc/profile.d</filename> directory with the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
+<screen role="root"><userinput>ln -v -nsf OpenJDK-&openjdk-version;-bin /opt/jdk</userinput></screen>
+
+      <para>The information below assumes your system is set up using the
+      instructions found in <quote><xref
+      linkend="postlfs-config-profile"/></quote>. You may need to extract the
+      relevant information below and incorporate it into your system's startup
+      files if your system is set up differently.</para>
+
+      <para>Add the following <filename>openjdk.sh</filename> shell startup
+      file to the <filename>/etc/profile.d</filename> directory with the
+      following commands as the <systemitem class="username">root</systemitem>
+      user:</para>
 
 <screen role="root"><userinput>cat &gt; /etc/profile.d/openjdk.sh &lt;&lt; "EOF"
@@ -465,16 +473,20 @@
 
 # Set JAVA_HOME directory
-JAVA_HOME=/opt/OpenJDK
+JAVA_HOME=/opt/jdk
 
 # Adjust PATH
-pathappend ${JAVA_HOME}/bin PATH
+pathappend $JAVA_HOME/bin PATH
 
 # Auto Java CLASSPATH
 # Copy jar files to, or create symlinks in this directory
+
 AUTO_CLASSPATH_DIR=/usr/share/java
+
 pathprepend . CLASSPATH
+
 for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
     pathappend $dir CLASSPATH
 done
+
 for jar in `find ${AUTO_CLASSPATH_DIR} -name "*.jar" 2>/dev/null`; do
     pathappend $jar CLASSPATH
@@ -482,7 +494,5 @@
 
 export JAVA_HOME CLASSPATH
-unset AUTO_CLASSPATH_DIR
-unset dir
-unset jar
+unset AUTO_CLASSPATH_DIR dir jar
 
 # End /etc/profile.d/openjdk.sh</literal>
@@ -494,7 +504,7 @@
 
 <screen><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF" &amp;&amp;
-<literal>MANDATORY_MANPATH     /opt/OpenJDK/man
-MANPATH_MAP           /opt/OpenJDK/bin     /opt/OpenJDK/man
-MANDB_MAP             /opt/OpenJDK/man     /var/cache/man/OpenJDK</literal>
+<literal>MANDATORY_MANPATH     /opt/jdk/man
+MANPATH_MAP           /opt/jdk/bin     /opt/jdk/man
+MANDB_MAP             /opt/jdk/man     /var/cache/man/jdk</literal>
 EOF
 mandb -c /opt/OpenJDK/man</userinput></screen>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5e628466ab8922f3db6503e46d2ce468b5e04893)
+++ introduction/welcome/changelog.xml	(revision f533b0df7c600cc7158dad8c6d8000eaf6f83a4b)
@@ -44,7 +44,12 @@
 
 -->
+
     <listitem>
       <para>October 22nd, 2012</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to OpenJDJ-1.7.0.9/IcedTea-2.3.3. Fixes
+          <ulink url="&blfs-ticket-root;3619">#3619</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[krejzi] - Xorg Intel Driver 2.20.12.</para>
Index: pst/xml/docbook-xsl.xml
===================================================================
--- pst/xml/docbook-xsl.xml	(revision 5e628466ab8922f3db6503e46d2ce468b5e04893)
+++ pst/xml/docbook-xsl.xml	(revision f533b0df7c600cc7158dad8c6d8000eaf6f83a4b)
@@ -118,5 +118,5 @@
 
 install -v -m644 -D README \
-                    /usr/share/doc/docbook-xsl-&docbook-xsl-version; &amp;&amp;
+                    /usr/share/doc/docbook-xsl-&docbook-xsl-version;/README.txt &amp;&amp;
 install -v -m755    RELEASE-NOTES* NEWS* \
                     /usr/share/doc/docbook-xsl-&docbook-xsl-version;</userinput></screen>
