diff --git a/general/prog/jdk.xml b/general/prog/jdk.xml
index 66cf7a4fa7..66bb2a55c6 100644
--- a/general/prog/jdk.xml
+++ b/general/prog/jdk.xml
@@ -373,7 +373,6 @@ unset ALT_CACERTS_FILE PATH_HOLD</userinput></screen>
 
 # Set JAVA_HOME directory
 JAVA_HOME=/opt/jdk/jdk
-export JAVA_HOME
 
 # Adjust PATH
 pathappend ${JAVA_HOME}/bin PATH
@@ -381,21 +380,14 @@ pathappend ${JAVA_HOME}/bin PATH
 # Auto Java CLASSPATH
 # Copy jar files to, or create symlinks in this directory
 AUTO_CLASSPATH_DIR=/usr/lib/classpath
-# Check for jar files in AUTO_CLASSPATH_DIR (if empty, don't include)
-if [ `ls ${AUTO_CLASSPATH_DIR}/*.jar &amp;> /dev/null` ]; then
-  CLASSPATH=.:${AUTO_CLASSPATH_DIR}
-else
-  # Always have the current directory in the CLASSPATH
-  CLASSPATH=.
-fi
-
-# Add subdirectories
-ls -d ${AUTO_CLASSPATH_DIR}/*/ &amp;> /dev/null &amp;&amp;
-for i in `ls -d ${AUTO_CLASSPATH_DIR}/*/`
-  do CLASSPATH=${CLASSPATH}:"${i}"
+pathprepend . CLASSPATH
+for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
+    pathappend $dir CLASSPATH
 done
 
-export CLASSPATH
+export JAVA_HOME CLASSPATH
+unset AUTO_CLASSPATH_DIR
+unset dir
 
 # End /etc/profile.d/jdk.sh</literal>
 EOF</userinput></screen>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 2be198ff37..e4bb143563 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -54,7 +54,8 @@
           instructions.</para>
         </listitem>
         <listitem>
-          <para>[dj] - Updated to JDK-1.5.0_10.</para>
+          <para>[dj] - Updated to JDK-1.5.0_10 and modiefied jdk.sh 
+          profile.d script.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/introduction/welcome/credits.xml b/introduction/welcome/credits.xml
index 428ffa98b5..9ee52b36d8 100644
--- a/introduction/welcome/credits.xml
+++ b/introduction/welcome/credits.xml
@@ -254,8 +254,8 @@
 
       <listitem>
         <para>Archive::Zip, cracklib, JDK-5, libdrm, libpcap, Mesa, ncpfs,
-        netfs, OpenOffice-2, pppd (update), RP-PPPoE, Samba-3, Subversion
-        and xterm:
+        netfs, OpenOffice-2, pppd (update), RP-PPPoE, Samba-3, Subversion,
+        Xorg-7 and xterm:
         <emphasis>DJ Lucas</emphasis></para>
       </listitem>