Index: general.ent
===================================================================
--- general.ent	(revision c8762f681868a034e5cde28da9138d085e1fb8ba)
+++ general.ent	(revision d3d92c8027e12246c1f691086419ed52cadce71e)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "08">                   <!-- Always 2 digits -->
+<!ENTITY day          "19">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
@@ -316,5 +316,5 @@
 <!ENTITY gcc3-version                 "3.3.6">
 <!ENTITY guile-version                "1.8.7">
-<!ENTITY icedtea6-version             "1.9.4">
+<!ENTITY icedtea6-version             "1.9.7">
 <!ENTITY jdk-version                  "6 Update 18">
 <!ENTITY junit-version                "4.8.1">
@@ -751,4 +751,5 @@
 <!ENTITY gimp-version                 "2.6.8">
 <!ENTITY evolution-version            "2.30.2">
+<!ENTITY icedtea-web-version          "1.0.1">
 
 <!-- Chapter 35 -->
Index: general/prog/icedtea6.xml
===================================================================
--- general/prog/icedtea6.xml	(revision c8762f681868a034e5cde28da9138d085e1fb8ba)
+++ general/prog/icedtea6.xml	(revision d3d92c8027e12246c1f691086419ed52cadce71e)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!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-download-binary-x86  "http://anduin.linuxfromscratch.org/files/BLFS/icedtea6-&icedtea6-version;-1-x86-bin.tar.xz">
+  <!ENTITY icedtea6-bin-md5sum-x86       "616f3841562b2787ce101a85378029d1">
   <!ENTITY icedtea6-bin-size-x86         "100 MB">
-  <!ENTITY icedtea6-bin-buildsize-x86    "844 MB">
+  <!ENTITY icedtea6-bin-buildsize-x86    "846 MB">
 
 <!-- This is not an error, x86 is larger than x86_64 because x86 includes a
@@ -14,9 +14,9 @@
 
   <!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-md5sum-x64       "98cf8a009c63cb2b32a94dd23b828fca">
   <!ENTITY icedtea6-bin-size-x64         "77 MB">
   <!ENTITY icedtea6-bin-buildsize-x64    "564 MB">
 
-  <!ENTITY icedtea6-source-md5sum        "d96d950b76a92e8cd327ae55ca4935e1">
+  <!ENTITY icedtea6-source-md5sum        "54a327a9591dab15049b81ec3c0af724">
   <!ENTITY openjdk-md5sum                "0b36adbf67e4f261e1b827ed4be4f447">
   <!ENTITY jaf-md5sum                    "bc95c133620bd68c161cac9891592901">
@@ -28,5 +28,5 @@
   <!ENTITY xerces-md5sum                 "408500aaaf1ff9f1e03e79defe90facc">
 
-  <!ENTITY icedtea6-source-size          "6.2 MB">
+  <!ENTITY icedtea6-source-size          "6.3 MB">
   <!ENTITY openjdk-size                  "43 MB">
   <!ENTITY jaf-size                      "70 KB">
@@ -38,6 +38,6 @@
   <!ENTITY xerces-size                   "7.0 MB">
 
-  <!ENTITY icedtea6-src-buildsize         "7 GB">
-  <!ENTITY icedtea6-time                  "34 SBU (an additional 83 SBU for testsuite)">
+  <!ENTITY icedtea6-src-buildsize         "6.6 GB">
+  <!ENTITY icedtea6-time                  "23 SBU (an additional 83 SBU for testsuite)">
 
   <!ENTITY openjdk-build "b20">
@@ -84,4 +84,9 @@
     programs.</para>
 
+    <note><para>The browser plugin and webstart implementation have been split
+    off into a separate project. To provide a complete implementation in a
+    source build, you will need to later install <xref linkend="icedtea-web"/>.
+    The binary installation does contain IcedTea-Web components.</para></note>
+
     <para>OpenJDK (and IcedTea6) is GPL'd code, however, it should be explained
     that there has been a special exception made for non-free projects to use
@@ -283,7 +288,7 @@
     <xref linkend="alsa-lib"/>,
     <xref linkend="cups"/>,
-    <xref linkend="gtk2"/>, and
-    <xref linkend="xorg7-lib"/>
-    </para>
+    <xref linkend="gtk2"/>,
+    <xref linkend="xorg7-lib"/>, and
+    <xref linkend="xulrunner"/></para>
 
     <bridgehead renderas="sect4">Additional Requirements
@@ -396,12 +401,17 @@
 ./autogen.sh &amp;&amp;
 ./configure --with-jdk-home=/opt/icedtea6-&icedtea6-version;-bin \
-            --enable-cacerts &amp;&amp;
+            --enable-cacerts \
+            --disable-plugin \
+            --disable-webstart &amp;&amp;
 make</userinput></screen>
 
     <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>
+    suite is also very dependent on the host system. You should expect to
+    see 6 or 7 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. The reason for the variable results is due to different
+    architechtures, versions of dependent libraries, and even the CA
+    certificates used to generate the <filename>cacerts</filename> file.</para>
 
     <para>Install the package with the following commands as the
@@ -421,5 +431,5 @@
 
     <para><parameter>--with-jdk-home</parameter>: This switch provides the
-    location of our temporary <application>JDK</application>.</para>
+    location of the temporary <application>JDK</application>.</para>
 
     <para><parameter>--enable-cacerts</parameter>: This switch enables the 
@@ -427,4 +437,17 @@
     certificates, suitable for use by
     <application>IcedTea6</application>.</para>
+
+    <para><parameter>--disable-plugin</parameter>: This switch disables
+    building of the included Java browser plugin. The included plugin and
+    webstart implementation has been split off into a separate project
+    <xref linkend="icedtea-web"/>. Omit this switch if you do not wish to build
+    <application>IcedTea-Web</application> separately.</para>
+
+    <para><parameter>--disable-webstart</parameter>: This switch disables 
+    building of the included <application>webstart</application>
+    implementation. As noted above, <application>webstart</application> has
+    split off into a separate project <xref linkend="icedtea-web"/>. Omit this
+    switch if you do not wish to build <application>IcedTea-Web</application>
+    separately.</para>
 
   </sect2>
@@ -478,8 +501,11 @@
 EOF</userinput></screen>
 
-    <para>The <application>Java</application> plugin is located at
-    <filename class="directory">$JAVA_HOME/jre/plugin/<replaceable>&lt;arch&gt;</replaceable>/IcedTeaPlugin.so</filename>.
+    <para>If you've installed only the binary distribution, the
+    <application>Java</application> plugin is located at
+    <filename class="directory">$JAVA_HOME/jre/lib/<replaceable>&lt;arch&gt;</replaceable>/IcedTeaPlugin.so</filename>.
     Make a symbolic link to the file in that directory from your browser(s)
-    plugins directory.</para>
+    plugins directory. If you've built from source, move on to the
+    <xref linkend="icedtea-web"/> instructions to build the browser
+    plugin.</para>
 
     <important>
@@ -502,7 +528,7 @@
 
       <seglistitem>
-        <seg>appletviewer, apt, extcheck, idlj, HtmlConverter, jar,
+        <seg>apt, extcheck, idlj, HtmlConverter, jar,
         jarsigner, java, javac, javadoc, javah, javap, java-rmi.cgi,
-        javaws, jconsole, jdb, jhat, jinfo, jmap, jps,
+        jconsole, jdb, jhat, jinfo, jmap, jps,
         jrunscript, jsadebugd, jstack, jstat, jstatd, keytool,
         native2ascii, orbd, pack200, policytool, rmic, rmid, rmiregistry,
@@ -520,14 +546,4 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="appletviewer-it6">
-        <term><command>appletviewer</command></term>
-        <listitem>
-          <para>runs Java applets outside of the context of a browser.</para>
-          <indexterm zone="icedtea6 appletviewer-it6">
-            <primary sortas="b-appletviewer">appletviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="apt-it6">
         <term><command>apt</command></term>
@@ -647,14 +663,4 @@
           <indexterm zone="icedtea6 java-rmi.cgi-it6">
             <primary sortas="b-java-rmi.cgi">java-rmi.cgi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javaws-it6">
-        <term><command>javaws</command></term>
-        <listitem>
-          <para>launches Java application/applets hosted on a network.</para>
-          <indexterm zone="icedtea6 javaws-it6">
-            <primary sortas="b-javaws">javaws</primary>
           </indexterm>
         </listitem>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c8762f681868a034e5cde28da9138d085e1fb8ba)
+++ introduction/welcome/changelog.xml	(revision d3d92c8027e12246c1f691086419ed52cadce71e)
@@ -42,4 +42,19 @@
 -->
     <listitem>
+      <para>February 19th, 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated to IcedTea6-1.9.7.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Separated IcedTea-Web from IcedTea6.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Added IcedTea6-Web-1.0.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 8th, 2010</para>
       <itemizedlist>
@@ -47,4 +62,6 @@
           <para>[thomas] - Added Soprano, Virtuoso, Raptor, Rasqal, Redland,
           Strigi, DBusMenu-Qt, CLucene, QCA, Boost, Exiv2, iODBC</para>
+        </listitem>
+        <listitem>
           <para>[thomas] - Add a note about Phonon at QT4</para>
         </listitem>
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision c8762f681868a034e5cde28da9138d085e1fb8ba)
+++ introduction/welcome/credits.xml	(revision d3d92c8027e12246c1f691086419ed52cadce71e)
@@ -274,6 +274,6 @@
 
       <listitem>
-        <para>Archive::Zip, cracklib, IcedTea6, JDK6, ksh, libdrm, libpcap,
-        Mesa, <!-- ncpfs, --> <!-- RP-PPPoE, --> netfs, OpenOffice-2,
+        <para>Archive::Zip, cracklib, IcedTea6, IcedTea-Web, JDK6, ksh, libdrm,
+        libpcap, Mesa, <!-- ncpfs, --> <!-- RP-PPPoE, --> netfs, OpenOffice-2,
         PPP (update), Samba-3, Subversion, Xorg-7 and xterm:
         <emphasis>DJ Lucas</emphasis></para>
Index: xsoft/other/icedtea-web.xml
===================================================================
--- xsoft/other/icedtea-web.xml	(revision d3d92c8027e12246c1f691086419ed52cadce71e)
+++ xsoft/other/icedtea-web.xml	(revision d3d92c8027e12246c1f691086419ed52cadce71e)
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY icedtea-web-download-http "http://icedtea.classpath.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz">
+  <!ENTITY icedtea-web-download-ftp  " ">
+  <!ENTITY icedtea-web-md5sum        "30f969de0503a296226ae0a1876f9702">
+  <!ENTITY icedtea-web-size          "820 KB">
+  <!ENTITY icedtea-web-buildsize     "20 MB">
+  <!ENTITY icedtea-web-time          "0.4 SBU">
+]>
+
+<sect1 id="icedtea-web" xreflabel="IcedTea-Web-&icedtea-web-version;">
+  <?dbhtml filename="icedtea-web.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>IcedTea-Web-&icedtea-web-version;</title>
+
+  <indexterm zone="icedtea-web">
+    <primary sortas="a-IcedTea-Web">IcedTea-Web</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to IcedTea-Web</title>
+
+    <para>The <application>IcedTea-Web</application> package contains both a
+    <application>Java</application> browser plugin, and a new webstart
+    implementation, licensed under GPLV3.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&icedtea-web-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&icedtea-web-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &icedtea-web-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &icedtea-web-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &icedtea-web-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &icedtea-web-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">IcedTea-Web Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="icedtea6"/> (built from source)</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/icedtea-web"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of IcedTea-Web</title>
+
+    <para>Install <application>IcedTea-Web</application> by running the
+    following commands:</para>
+
+<screen><userinput>sed 's@prefix)/man@mandir)@' \
+    -i Makefile.in &amp;&amp;
+./configure --prefix=${JAVA_HOME}/jre \
+            --with-jdk-home=${JAVA_HOME} \
+            --disable-docs \
+            --mandir=${JAVA_HOME}/man &amp;&amp;
+make</userinput></screen>
+
+<!-- <para>To test the results, issue: <command>make test</command>.</para> -->
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--with-jdk-home</parameter>: This switch provides the
+    location of the installed <application>JDK</application>.</para>
+
+    <para><parameter>--disable-docs</parameter>: This switch disables
+    installation of additional developer-related documentation. Omit this
+    switch if you would like to do development work on
+    <application>IcedTea-Web</application>.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuration Information</title>
+
+    <para>As the <systemitem class="username">root</systemitem> user, create a
+    symbolic link to the plugin from your browser(s) plugins directory.</para>
+
+<screen><userinput role="root">ln -s ${JAVA_HOME}/jre/lib/&lt;<replaceable>arch</replaceable>&gt;/IcedTeaPlugin.so \
+    /usr/lib/mozilla/plugins/</userinput></screen>
+
+    <important>
+      <para>The plugin must be a symlink for it to work. If not, the browsers
+      will crash when you attempt to load a <application>Java</application>
+      application.</para>
+    </important>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+
+      <seglistitem>
+        <seg>itweb-settings, javaws, and pluginappletviewer</seg>
+        <seg>IcedTeaPlugin.so, about.jar, netx.jar, plugin.jar</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="itweb-settings">
+        <term><command>itweb-settings</command></term>
+        <listitem>
+          <para>allows customization of the browser plugin and
+          <application>javaws</application>.</para>
+          <indexterm zone="icedtea-web itweb-settings">
+            <primary sortas="b-itweb-settings">itweb-settings</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javaws-itweb">
+        <term><command>javaws</command></term>
+        <listitem>
+          <para>launches Java application/applets hosted on a network.</para>
+          <indexterm zone="icedtea-web javaws-itweb">
+            <primary sortas="b-javaws">javaws</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pluginappletviewer">
+        <term><command>pluginappletviewer</command></term>
+        <listitem>
+          <para>runs Java applets outside of the context of a browser.</para>
+          <indexterm zone="icedtea-web pluginappletviewer">
+            <primary sortas="b-pluginappletviewer">pluginappletviewer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="IcedTeaPlugin">
+        <term><filename class='libraryfile'>IcedTeaPlugin.so</filename></term>
+        <listitem>
+          <para>is the <application>Java</application> browser plugin.</para>
+          <indexterm zone="icedtea-web IcedTeaPlugin">
+            <primary sortas="c-IcedTeaPlugin">IcedTeaPlugin.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aboutjar">
+        <term><filename class='libraryfile'>about.jar</filename></term>
+        <listitem>
+          <para>contains functions for the about dialog boxes.</para>
+          <indexterm zone="icedtea-web aboutjar">
+            <primary sortas="c-aboutjar">about.jar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="netxjar">
+        <term><filename class='libraryfile'>netx.jar</filename></term>
+        <listitem>
+          <para>contains functions for the
+          <application>IcedTea-Web</application>
+          webstart implementation (NetX).</para>
+          <indexterm zone="icedtea-web netxjar">
+            <primary sortas="c-netxjar">netx.jar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pluginjar">
+        <term><filename class='libraryfile'>plugin.jar</filename></term>
+        <listitem>
+          <para>contains functions for the
+          <application>IcedTea-Web</application>
+          <application>Java</application> plugin.</para>
+          <indexterm zone="icedtea-web pluginjar">
+            <primary sortas="c-pluginjar">plugin.jar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xsoft/other/other.xml
===================================================================
--- xsoft/other/other.xml	(revision c8762f681868a034e5cde28da9138d085e1fb8ba)
+++ xsoft/other/other.xml	(revision d3d92c8027e12246c1f691086419ed52cadce71e)
@@ -24,4 +24,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pidgin.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xchat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icedtea-web.xml"/>
 
 </chapter>
