Index: general.ent
===================================================================
--- general.ent	(revision 82459c393277e3c8d47f73e3b405572cc9ede948)
+++ general.ent	(revision bc2b746abc38e63fbdf7d0e78975e12285174e74)
@@ -1,3 +1,3 @@
-<!ENTITY day          "27">                   <!-- Always 2 digits -->
+<!ENTITY day          "28">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
@@ -174,8 +174,8 @@
 <!ENTITY gcc3-version                 "3.3.6">
 <!ENTITY guile-version                "1.6.7">
-<!ENTITY jdk-bin-version              "1.5.0_06">
-<!ENTITY jdk-bin-string               "1_5_0_06">
-<!ENTITY jdk-src-version              "1.5.0_05">
-<!ENTITY jdk-src-string               "1_5_0_05">
+<!ENTITY jdk-bin-version              "1.5.0_07">
+<!ENTITY jdk-bin-string               "1_5_0_07">
+<!ENTITY jdk-src-version              "1.5.0_07">
+<!ENTITY jdk-src-string               "1_5_0_07">
 <!ENTITY librep-version               "0.17">
 <!ENTITY NASM-version                 "0.98.39">
Index: general/prog/jdk.xml
===================================================================
--- general/prog/jdk.xml	(revision 82459c393277e3c8d47f73e3b405572cc9ede948)
+++ general/prog/jdk.xml	(revision bc2b746abc38e63fbdf7d0e78975e12285174e74)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY jdk-download-source "https://tiger.dev.java.net/jdk_5_0_05.html">
+  <!ENTITY jdk-download-source "https://tiger.dev.java.net/jdk_5_0_07.html">
   <!ENTITY jdk-download-binary "http://java.sun.com/j2se/1.5.0/download.jsp">
   <!ENTITY jdk-source-md5sum   "&sources-anduin-http;/j/jdk-&jdk-src-version;.md5sums">
-  <!ENTITY jdk-bin-md5sum      "3cdad4a383b93680f02f6f06198c2227">
-  <!ENTITY jdk-bin-size        "46.7 MB">
-  <!ENTITY jdk-src-size        "64.4 MB (three .jar files)">
-  <!ENTITY jdk-src-buildsize   "1553 MB">
-  <!ENTITY jdk-time            "29 SBU">
+  <!ENTITY jdk-bin-md5sum      "1325082c36b4adcb71bc5449ae4c68cf">
+  <!ENTITY jdk-bin-size        "47.9 MB">
+  <!ENTITY jdk-src-size        "65.3 MB (three .jar files)">
+  <!ENTITY jdk-src-buildsize   "1651 MB">
+  <!ENTITY jdk-time            "35 SBU">
 ]>
 
@@ -71,8 +71,8 @@
       <listitem>
         <para>Source download: <ulink url="&jdk-download-source;"/>
-        (to download jdk-&jdk-src-string;-fcs-src-b05-jrl-13_oct_2005.jar (or
+        (to download jdk-&jdk-src-string;-fcs-src-b03-jrl-03_may_2006.jar (or
          optionally the JIUL version),
-         jdk-&jdk-src-string;-fcs-bin-b05-13_oct_2005.jar, and
-         jdk-&jdk-src-string;-mozilla_headers-b05-unix-26_aug_2005.jar)</para>
+         jdk-&jdk-src-string;-fcs-bin-b03-03_may_2006.jar, and
+         jdk-&jdk-src-string;-mozilla_headers-b03-unix-03_may_2006.jar)</para>
       </listitem>
 
@@ -80,12 +80,12 @@
         <para>Download MD5 sums (source):
           <simplelist>
-            <member>215c5175e54c2facccc2c7845e339725
-                    jdk-&jdk-src-string;-fcs-bin-b05-13_oct_2005.jar
+            <member>8e4de82c323fcf42a04e1eb667941052
+                    jdk-&jdk-src-string;-fcs-bin-b03-03_may_2006.jar
             </member>
-            <member>884dd87faa082d294f725857c895b6f6
-                    jdk-&jdk-src-string;-fcs-src-b05-jrl-13_oct_2005.jar
+            <member>a111ed35f21a2f71422ade4c931249e6
+                    jdk-&jdk-src-string;-fcs-src-b03-jrl-03_may_2006.jar
             </member>
-            <member>3a3627ab55c6a63cddc90d5b3fad4b83
-                    jdk-&jdk-src-string;-mozilla_headers-b05-unix-26_aug_2005.jar
+            <member>ac3d0196f437260c2bdc30326af3fc94
+                    jdk-&jdk-src-string;-mozilla_headers-b03-unix-03_may_2006.jar
             </member>
           </simplelist>
@@ -129,8 +129,4 @@
         <para><ulink
         url="&patch-root;/jdk-&jdk-src-version;-remove_fixed_paths-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/jdk-&jdk-src-version;-xorg-6.8.1-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -171,5 +167,5 @@
 
     <tip>
-      <para>The <command>./jdk-&jdk-bin-string;-linux-i?86.bin</command>
+      <para>The <command>./jdk-mod.bin</command>
       command below unpacks the distribution into a
       <filename class='directory'>jdk&jdk-bin-version;</filename> directory.
@@ -246,14 +242,11 @@
     <para>Set/unset some variables which affect the build:</para>
 
-<screen><userinput>export ALT_BOOTDIR="$JAVA_HOME" &amp;&amp;
-unset JAVA_HOME &amp;&amp;
-unset CLASSPATH
-unset CFLAGS
-unset CXXFLAGS
-unset LDFLAGS
+<screen><userinput>export ALT_BOOTDIR=${JAVA_HOME} &amp;&amp;
+export CLASSPATH_HOLD=${CLASSPATH} &amp;&amp;
+unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS &amp;&amp;
 export ALT_DEVTOOLS_PATH="/usr/bin" &amp;&amp;
-export BUILD_NUMBER="update-05" &amp;&amp;
+export BUILD_NUMBER="update-7" &amp;&amp;
 export DEV_ONLY=true &amp;&amp;
-export ALT_MOZILLA_HEADERS_PATH=$PWD/share/plugin/ &amp;&amp;
+export ALT_MOZILLA_HEADERS_PATH=${PWD}/share/plugin/ &amp;&amp;
 export INSANE=true &amp;&amp;
 export MAKE_VERBOSE=true &amp;&amp;
@@ -295,19 +288,15 @@
 <screen role="root"><userinput>cp -v -a j2sdk-image /opt/jdk/jdk-&jdk-src-version; &amp;&amp;
 chown -v -R root:root /opt/jdk/jdk-&jdk-src-version; &amp;&amp;
-ln -sf motif21/libmawt.so  /opt/jdk/jdk-&jdk-src-version;/jre/lib/i386/</userinput></screen>
+ln -v -sf motif21/libmawt.so  /opt/jdk/jdk-&jdk-src-version;/jre/lib/i386/</userinput></screen>
 
     <para>Restore the unprivileged user's environment using the following
     commands:</para>
 
-<screen><userinput>unset ALT_BOOTDIR &amp;&amp;
-unset ALT_DEVTOOLS_PATH &amp;&amp;
-unset BUILD_NUMBER &amp;&amp;
-unset DEV_ONLY &amp;&amp;
-unset ALT_MOZILLA_HEADERS_PATH &amp;&amp;
-unset INSANE &amp;&amp;
-unset MAKE_VERBOSE &amp;&amp;
-unset ALT_CACERTS_FILE &amp;&amp;
+<screen><userinput>export JAVA_HOME=${ALT_BOOTDIR} &amp;&amp;
+export CLASSPATH=${CLASSPATH_HOLD} &amp;&amp;
 export PATH=${PATH_HOLD} &amp;&amp;
-unset PATH_HOLD</userinput></screen>
+unset ALT_BOOTDIR CLASSPATH_HOLD ALT_DEVTOOLS_PATH BUILD_NUMBER &amp;&amp;
+unset DEV_ONLY ALT_MOZILLA_HEADERS_PATH INSANE MAKE_VERBOSE &amp;&amp;
+unset ALT_CACERTS_FILE PATH_HOLD</userinput></screen>
 
   </sect2>
@@ -316,8 +305,8 @@
     <title>Command Explanations</title>
 
-    <para><command>export ALT_BOOTDIR="$JAVA_HOME"</command>: This variable sets
+    <para><command>export ALT_BOOTDIR=${JAVA_HOME}</command>: This variable sets
     the location of the bootstrap <application>JDK</application>.</para>
 
-    <para><command>export ALT_MOZILLA_HEADERS_PATH=$PWD/share/plugin/</command>:
+    <para><command>export ALT_MOZILLA_HEADERS_PATH=${PWD}/share/plugin/</command>:
     This tells the build exactly where to find the
     <application>Mozilla</application> headers.  This has changed since the
@@ -328,5 +317,5 @@
     changes the location where the build finds the needed executables.</para>
 
-    <para><command>export BUILD_NUMBER="blfs-&blfs-version;"</command>:
+    <para><command>export BUILD_NUMBER="update-7"</command>:
     This will help you identify the compiled version of the runtime environment
     and virtual machine by appending this information to the version
@@ -337,14 +326,6 @@
     <application>rpm</application>.</para>
 
-    <para><command>unset JAVA_HOME</command>: This clears the
-    <envar>JAVA_HOME</envar> variable as recommended by the build
-    instructions.</para>
-
-    <para><command>unset CLASSPATH</command>: This clears the
-    <envar>CLASSPATH</envar> variable as recommended by the build
-    instructions.</para>
-
-    <para><command>unset CFLAGS/CXXFLAGS...</command>: These variables cause
-    miscompilation of the build. Never set them.</para>
+    <para><command>unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS</command>:
+    These variables cause miscompilation of the build. Never set them.</para>
 
     <para><command>export INSANE=true</command>: The certified platform for the
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 82459c393277e3c8d47f73e3b405572cc9ede948)
+++ introduction/welcome/changelog.xml	(revision bc2b746abc38e63fbdf7d0e78975e12285174e74)
@@ -41,4 +41,13 @@
 
 -->
+    <listitem>
+      <para>June 28th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated JDK, source and bin, to jdk-1.5.0
+          update 7.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
