diff --git a/releng/org.eclipse.rse.build/bin/batch_sign.sh b/releng/org.eclipse.rse.build/bin/batch_sign.sh
index 3f351726ec3..900d5d69112 100755
--- a/releng/org.eclipse.rse.build/bin/batch_sign.sh
+++ b/releng/org.eclipse.rse.build/bin/batch_sign.sh
@@ -21,7 +21,7 @@
umask 22
#Use Java5 on build.eclipse.org
-#export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH
+#export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH
export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH
diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
index d5a243c4abf..9705d444b49 100755
--- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
@@ -29,7 +29,7 @@ mydir=`pwd`
echo ${mydir}
#Use Java5 on build.eclipse.org
-#export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH
+#export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH
#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH
export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
diff --git a/releng/org.eclipse.rse.build/bin/doit_nightly.sh b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
index 19c65ecc556..a01ba052c31 100755
--- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
@@ -15,7 +15,7 @@
umask 22
#Use Java5 on build.eclipse.org
-#export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH
+#export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH
#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH
export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
diff --git a/releng/org.eclipse.rse.build/bootstrap.sh b/releng/org.eclipse.rse.build/bootstrap.sh
index 43d7e5296c4..dcf85f97eed 100644
--- a/releng/org.eclipse.rse.build/bootstrap.sh
+++ b/releng/org.eclipse.rse.build/bootstrap.sh
@@ -178,7 +178,7 @@ fi
if [ "$HOSTNAME" == "utils" ]
then
#Running on build.eclipse.org
- java15_home=/shared/common/ibm-java2-ppc64-50
+ java15_home=/shared/dsdp/tm/ibm-java2-ppc64-50
#java14_home=/shared/webtools/apps/IBMJava2-ppc64-142
java14_home=/shared/webtools/apps/IBMJava2-ppc-142
javadoc="-Djavadoc15=$java15_home/bin/javadoc"
diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
index 0472a5adc58..35181439801 100755
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
@@ -13,7 +13,7 @@
#
# Prerequisites:
# - Eclipse 3.3Mx installed in $HOME/ws2/eclipse
-# - Java5 in the PATH or in /shared/common/ibm-java2-ppc64-50
+# - Java5 in the PATH or in /shared/dsdp/tm/ibm-java2-ppc64-50
curdir=`pwd`
cd `dirname $0`
@@ -22,7 +22,7 @@ mydir=`pwd`
umask 022
#Use Java5 on build.eclipse.org - need JRE for pack200
-export PATH=/shared/common/ibm-java2-ppc64-50/jre/bin:/shared/common/ibm-java2-ppc64-50/bin:$PATH
+export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/jre/bin:/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
basebuilder=${HOME}/ws2/org.eclipse.releng.basebuilder
# patch site.xml
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml b/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
index bcf91358cb5..aee9d3d9363 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
+++ b/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
@@ -94,7 +94,7 @@
-
+
diff --git a/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml b/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
index 8c82e8e4327..9ee2d44f348 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
+++ b/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
@@ -107,7 +107,7 @@
-
+