diff --git a/utils_dev/RUN_clean.bat b/utils_dev/RUN_clean.bat
index 2ea5e626ae..1bebcd419f 100644
--- a/utils_dev/RUN_clean.bat
+++ b/utils_dev/RUN_clean.bat
@@ -1,14 +1,19 @@
 @Title Adempiere Clean
 @Rem $Header: /cvsroot/adempiere/utils_dev/RUN_clean.bat,v 1.4 2005/09/16 00:49:29 jjanke Exp $
 
-@CALL myDevEnv.bat
-@IF NOT %ADEMPIERE_ENV%==Y GOTO NOBUILD
+@Rem Check java home
+@IF NOT EXIST "%JAVA_HOME%\bin" ECHO "** JAVA_HOME NOT found"
+@SET PATH=%JAVA_HOME%\bin;%PATH%
+
+@Rem Check jdk
+@IF NOT EXIST "%JAVA_HOME%\lib\tools.jar" ECHO "** Need Full Java SDK **"
+
+@Rem Set ant classpath
+@SET ANT_CLASSPATH=%CLASSPATH%;..\tools\lib\ant.jar;..\tools\lib\ant-launcher.jar;..\tools\lib\ant-swing.jar;..\tools\lib\ant-commons-net.jar;..\tools\lib\commons-net-1.4.0.jar
+@SET ANT_CLASSPATH=%ANT_CLASSPATH%;"%JAVA_HOME%\lib\tools.jar"
 
 @echo Cleanup ...
-@"%JAVA_HOME%\bin\java" -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.Main clean
+@"%JAVA_HOME%\bin\java" -classpath %ANT_CLASSPATH% -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.Main clean
 
 @Pause
 @exit
-:NOBUILD
-@Echo Check myDevEnv.bat (copy from myDevEnvTemplate.bat)
-@Pause
\ No newline at end of file
diff --git a/utils_dev/RUN_clean.sh b/utils_dev/RUN_clean.sh
index 4e15d9ac23..bbf0740b53 100755
--- a/utils_dev/RUN_clean.sh
+++ b/utils_dev/RUN_clean.sh
@@ -1,21 +1,27 @@
 #	This script cleans Adempiere builds
 #	Ported from Windows script Marek Mosiewicz<marek.mosiewicz@jotel.com.pl>
 
-SAVED_DIR=`pwd`			#save current dir
-cd `dirname $0`/../utils_dev	#change dir to place where script resides - doesn not work with sym links
-UTILS_DEV=`pwd`			#this is adempiere source
-cd $SAVED_DIR			#back to the saved directory
-
-.  $UTILS_DEV/myDevEnv.sh	#call environment
-
-
-if [ ! $ADEMPIERE_ENV==Y ] ; then
-    echo "Can't set developemeent environemnt - check myDevEnv.sh"
-    exit 1
+#check java home
+if [ $JAVA_HOME ]; then
+  export PATH=$JAVA_HOME/bin:$PATH	
+else
+  echo JAVA_HOME is not set.
+  echo You may not be able to build Adempiere
+  echo Set JAVA_HOME to the directory of your local JDK.
+  exit
 fi
 
+# check jdk
+if  [ ! -f $JAVA_HOME/lib/tools.jar ] ; then
+   echo "** Need full Java SDK **"
+   exit
+fi
+
+#classpath
+export ANT_CLASSPATH=$CLASSPATH:../tools/lib/ant.jar:../tools/lib/ant-launcher.jar:../tools/lib/ant-swing.jar:../tools/lib/ant-commons-net.jar:../tools/lib/commons-net.jar:$JAVA_HOME/lib/tools.jar
+
 echo Cleanup ...
-$JAVA_HOME/bin/java -Dant.home="." $ANT_PROPERTIES org.apache.tools.ant.Main clean
+$JAVA_HOME/bin/java -classpath $ANT_CLASSPATH -Dant.home="." $ANT_PROPERTIES org.apache.tools.ant.Main clean
 
 echo Done ...
 
diff --git a/utils_dev/RUN_install.bat b/utils_dev/RUN_install.bat
index 2d88fbef7e..c9e6dfd0e0 100644
--- a/utils_dev/RUN_install.bat
+++ b/utils_dev/RUN_install.bat
@@ -1,13 +1,18 @@
 @Title Adempiere Install
 @Rem $Header: /cvsroot/adempiere/utils_dev/RUN_install.bat,v 1.3 2005/09/16 00:49:29 jjanke Exp $
 
-@CALL myDevEnv.bat
-@IF NOT %ADEMPIERE_ENV%==Y GOTO NOBUILD
+@Rem Check java home
+@IF NOT EXIST "%JAVA_HOME%\bin" ECHO "** JAVA_HOME NOT found"
+@SET PATH=%JAVA_HOME%\bin;%PATH%
 
-@"%JAVA_HOME%\bin\java" -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.Main install
+@Rem Check jdk
+@IF NOT EXIST "%JAVA_HOME%\lib\tools.jar" ECHO "** Need Full Java SDK **"
+
+@Rem Set ant classpath
+@SET ANT_CLASSPATH=%CLASSPATH%;..\tools\lib\ant.jar;..\tools\lib\ant-launcher.jar;..\tools\lib\ant-swing.jar;..\tools\lib\ant-commons-net.jar;..\tools\lib\commons-net-1.4.0.jar
+@SET ANT_CLASSPATH=%ANT_CLASSPATH%;"%JAVA_HOME%\lib\tools.jar"
+
+@"%JAVA_HOME%\bin\java" -classpath %ANT_CLASSPATH% -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.Main install
 
 @Pause
 @exit
-:NOBUILD
-@Echo Check myDevEnv.bat (copy from myDevEnvTemplate.bat)
-@Pause
diff --git a/utils_dev/RUN_install.sh b/utils_dev/RUN_install.sh
index 1e9c28adee..13110a6a01 100755
--- a/utils_dev/RUN_install.sh
+++ b/utils_dev/RUN_install.sh
@@ -1,22 +1,27 @@
 #	This script installs adempiere
 #	Ported from Windows script Marek Mosiewicz<marek.mosiewicz@jotel.com.pl>
 
-
-SAVED_DIR=`pwd`			#save current dir
-cd `dirname $0`/../utils_dev	#change dir to place where script resides - doesn not work with sym links
-UTILS_DEV=`pwd`			#this is adempiere source
-cd $SAVED_DIR			#back to the saved directory
-
-.  $UTILS_DEV/myDevEnv.sh	#call environment
-
-
-if [ ! $ADEMPIERE_ENV==Y ] ; then
-    echo "Can't set developemeent environemnt - check myDevEnv.sh"
-    exit 1
+#check java home
+if [ $JAVA_HOME ]; then
+  export PATH=$JAVA_HOME/bin:$PATH	
+else
+  echo JAVA_HOME is not set.
+  echo You may not be able to build Adempiere
+  echo Set JAVA_HOME to the directory of your local JDK.
+  exit
 fi
 
+# check jdk
+if  [ ! -f $JAVA_HOME/lib/tools.jar ] ; then
+   echo "** Need full Java SDK **"
+   exit
+fi
+
+#classpath
+export ANT_CLASSPATH=$CLASSPATH:../tools/lib/ant.jar:../tools/lib/ant-launcher.jar:../tools/lib/ant-swing.jar:../tools/lib/ant-commons-net.jar:../tools/lib/commons-net.jar:$JAVA_HOME/lib/tools.jar
+
 echo Installing ...
-$JAVA_HOME/bin/java -Dant.home="." $ANT_PROPERTIES org.apache.tools.ant.Main install
+$JAVA_HOME/bin/java -classpath $ANT_CLASSPATH -Dant.home="." $ANT_PROPERTIES org.apache.tools.ant.Main install
 
 echo Done ...