Index: general/prog/gcc/gcc-intro.xml
===================================================================
--- general/prog/gcc/gcc-intro.xml	(revision b7d0bb4a5259a15d4aadd9377a645fef32d0fa5e)
+++ general/prog/gcc/gcc-intro.xml	(revision ce2d9568b9a1244ea005601da71b0567b2366b49)
@@ -23,5 +23,6 @@
 <sect3><title>Additional Downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required patch: <ulink url="http://downloads.linuxfromscratch.org/gcc-3.3.1-no_fixincludes-2.patch"/></para></listitem>
+<listitem><para>Required patch: <ulink url="&patch-root;/gcc-3.3.1-no_fixincludes-2.patch"/></para></listitem>
+<listitem><para>Required patch: <ulink url="&patch-root;/gcc-3.3.1-suppress-libiberty.patch"/></para></listitem>
 </itemizedlist></sect3>
 
Index: general/prog/gcc2/gcc2-intro.xml
===================================================================
--- general/prog/gcc2/gcc2-intro.xml	(revision b7d0bb4a5259a15d4aadd9377a645fef32d0fa5e)
+++ general/prog/gcc2/gcc2-intro.xml	(revision ce2d9568b9a1244ea005601da71b0567b2366b49)
@@ -26,6 +26,8 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required patches:
-<ulink url="&hfile-root;"/></para></listitem></itemizedlist>
+<listitem><para><ulink url="&patch-root;/gcc-2.95.3-2.patch"/></para></listitem>
+<listitem><para><ulink url="&patch-root;/gcc-2.95.3-no-fixinc.patch"/></para></listitem>
+<listitem><para><ulink url="&patch-root;/gcc-2.95.3-returntype-fix.patch"/></para></listitem>
+</itemizedlist>
 </sect3>
 
Index: general/prog/jdk/j2sdk-exp.xml
===================================================================
--- general/prog/jdk/j2sdk-exp.xml	(revision b7d0bb4a5259a15d4aadd9377a645fef32d0fa5e)
+++ general/prog/jdk/j2sdk-exp.xml	(revision ce2d9568b9a1244ea005601da71b0567b2366b49)
@@ -1,21 +1,4 @@
 <sect2>
 <title>Command explanations</title>
-
-<para><command>T=`grep...</command>: Determines the part where the tarfile 
-begins in the self extracting archive.</para>
-
-<para><command>patch -Np1 -i j2sdk-${VERSION}-fix-intl-files.patch</command>: 
-Patch to fix duplicate messages in the international files.</para>
-<para><command>patch -Np1 -i j2sdk-${VERSION}-link-missing-libs.patch</command>: Patch to add missing libs to fix unresolved symbols.</para>
-<para><command>patch -Np1 -i j2sdk-${VERSION}-remove-fixed-paths.patch
-</command>: The build wants the binaries in specific locations, this patch 
-modifies this to use the current <envar>PATH</envar> environment to find 
-binaries.</para>
-<para><command>patch -Np1 -i j2sdk-${VERSION}-syntax-fixes.patch</command>: 
-Patch to fix syntax for <application><acronym>GCC</acronym>-3</application>.
-</para>
-<para><command>patch -Np1 -i j2sdk-${VERSION}-use-included-motif.patch
-</command>: Patch to rename the internal motif library to avoid conflicts with 
-an incompatible system installed version.</para>
 
 <para><command>export ALT_BOOTDIR="$JAVA_HOME"</command>: This var sets 
@@ -42,8 +25,8 @@
 <para><command>unset JAVA_HOME</command>: This clears the
 <envar>JAVA_HOME</envar>
-variable and prevents misdirection during compile.</para>
+variable as recommended by the build instructions.</para>
 
 <para><command>unset CLASSPATH</command>: This clears the
-<envar>CLASSPATH</envar> variable and prevents misdirection during compile.
+<envar>CLASSPATH</envar> variable as per the recommendations in the build instructions.
 </para>
 
Index: general/prog/jdk/j2sdk-inst.xml
===================================================================
--- general/prog/jdk/j2sdk-inst.xml	(revision b7d0bb4a5259a15d4aadd9377a645fef32d0fa5e)
+++ general/prog/jdk/j2sdk-inst.xml	(revision ce2d9568b9a1244ea005601da71b0567b2366b49)
@@ -20,5 +20,6 @@
 <para>The binary version is now installed.</para>
 
-<para>If you don't want to compile the source, skip ahead to the configuration
+<para>If you don't want to compile the source or are not in a postition to download the source
+owing to license restrictions, skip ahead to the configuration
 section.</para>
 
@@ -38,4 +39,5 @@
 patch -Np1 -i j2sdk-${VERSION}-remove-fixed-paths.patch &amp;&amp;
 patch -Np1 -i j2sdk-${VERSION}-syntax-fixes.patch &amp;&amp;
+patch -Np1 -i j2sdk-${VERSION}-motif-mkmsgcat.patch &amp;&amp;
 patch -Np1 -i j2sdk-${VERSION}-use-included-motif.patch</command></userinput></screen>
 
@@ -59,14 +61,11 @@
 <screen><userinput><command>export HOTSPOT_BUILD_JOBS=$MAKE_PARALLEL</command></userinput></screen>
 
-<para>The included <application>Motif</application> doesn't build properly with 
-the current <application>Glibc</application>/<application>XFree86
-</application>. A solution is to build the <application>Motif</application> 
-library before compiling the <application>J2SDK</application>. Note that
-the <application>Motif</application> build fails during the first run owing to 
-some syntax error. The brute force and easiest solution is to rerun the
-<command>make</command> command:)</para>
+<para>If the included <application>Motif</application> doesn't build properly, the
+error is noticed much later in the build.
+A solution is to build the <application>Motif</application> 
+library before compiling the <application>J2SDK</application>.</para>
 
 <screen><userinput><command>cd motif/lib/Xm &amp;&amp;
-make || make &amp;&amp;
+make &amp;&amp;
 cd ../../..</command></userinput></screen>
 
Index: general/prog/jdk/j2sdk-intro.xml
===================================================================
--- general/prog/jdk/j2sdk-intro.xml	(revision b7d0bb4a5259a15d4aadd9377a645fef32d0fa5e)
+++ general/prog/jdk/j2sdk-intro.xml	(revision ce2d9568b9a1244ea005601da71b0567b2366b49)
@@ -11,10 +11,10 @@
 <para>
 The <acronym>JDK</acronym> comes in two flavors, a precompiled binary and a 
-source package. The precompiled binary is linked against <acronym>GCC
-</acronym>-2 libraries. Due to the incompatibilities between
-<acronym>GCC</acronym>-2 and <acronym>GCC</acronym>-3, the precompiled java 
-plugin causes problems when <acronym>GCC</acronym>-3 compiled packages (for 
-example <application>Mozilla</application>) try to load the <application>Java
-</application> plugin. The source package requires registration at the Sun 
+source package. Previously, the plugin included in the <acronym>JDK</acronym> binary
+package was unusable on <acronym>LFS</acronym>
+owing to incompatibilities with <acronym>GCC</acronym>-3 compiled browsers.
+This is not the case anymore.</para>
+
+<para>The source package requires registration at the Sun 
 developer site and accepting the Sun Community Source License.
 The source code cannot be downloaded from some countries, so for users
@@ -27,8 +27,10 @@
 headers package available at the same location.</para>
 
+<!--
 <para>For users who cannot download the <application>J2SDK</application> source owing to license restrictions, <application>blackdown
 </application> has an <acronym>GCC</acronym>-3 based precompiled version.
 Check out <ulink url="http://www.blackdown.org/"/> for more
 information.</para>
+-->
 
 <sect3><title>Package information</title>
@@ -50,6 +52,12 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required Patches:
-<ulink url="&hfile-root;"/></para></listitem></itemizedlist>
+<listitem><para><ulink url="&patch-root;/j2sdk-1.4.1-fix-intl-files.patch"/></para></listitem>
+<listitem><para><ulink url="&patch-root;/j2sdk-1.4.1-gcc33-1.patch"/></para></listitem>
+<listitem><para><ulink url="&patch-root;/j2sdk-1.4.1-link-missing-libs.patch"/></para></listitem>
+<listitem><para><ulink url="&patch-root;/j2sdk-1.4.1-motif-mkmsgcat.patch"/></para></listitem>
+<listitem><para><ulink url="&patch-root;/j2sdk-1.4.1-remove-fixed-paths.patch"/></para></listitem>
+<listitem><para><ulink url="&patch-root;/j2sdk-1.4.1-syntax-fixes.patch"/></para></listitem>
+<listitem><para><ulink url="&patch-root;/j2sdk-1.4.1-use-included-motif.patch"/></para></listitem>
+</itemizedlist>
 </sect3>
 
@@ -58,6 +66,6 @@
 <sect4><title>Required</title>
 <para><xref linkend="xfree86"/>, <xref linkend="zip"/>, <xref
-linkend="unzip"/>, <xref linkend="cpio"/>, <xref linkend="tcsh"/> and <xref
-linkend="gcc2"/></para></sect4>
+linkend="unzip"/>, <xref linkend="cpio"/>, and <xref linkend="tcsh"/>
+</para></sect4>
 </sect3>
 
