diff --git a/utils/RUN_Adempiere.sh b/utils/RUN_Adempiere.sh
index 64eea36f3e..bce91f2d0a 100644
--- a/utils/RUN_Adempiere.sh
+++ b/utils/RUN_Adempiere.sh
@@ -38,5 +38,7 @@ PROP=
 #  SECURE=-DADEMPIERE_SECURE=org.compiere.util.Secure
 SECURE=
 
-$JAVA -Xms32m -Xmx512m -DADEMPIERE_HOME=$ADEMPIERE_HOME $PROP $SECURE -classpath $CLASSPATH org.compiere.Adempiere
+#$JAVA -Xms32m -Xmx512m -DADEMPIERE_HOME=$ADEMPIERE_HOME $PROP $SECURE -classpath $CLASSPATH org.compiere.Adempiere
+# OSGi:
+$JAVA -Xms32m -Xmx512m -DADEMPIERE_HOME=$ADEMPIERE_HOME $PROP $SECURE -jar $ADEMPIERE_HOME/osgi/org.eclipse.osgi_3.5.0.v20090520.jar -clean -console -application org.adempiere.Client
 
diff --git a/utils_dev/RUN_build.sh b/utils_dev/RUN_build.sh
index 8f19e63278..d43fb4d4d7 100755
--- a/utils_dev/RUN_build.sh
+++ b/utils_dev/RUN_build.sh
@@ -22,16 +22,18 @@ if  [ ! -f $JAVA_HOME/lib/tools.jar ] ; then
    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
+ANTLIB="-lib ../tools/lib/ant4eclipse/ -lib ../equinox-target/org.eclipse.osgi_3.5.0.v20090520.jar -lib ../tools/lib/ant-contrib-1.0b1.jar"
 
-export ANT_OPTS="-Xms128m -Xmx512m"
+#classpath
+export ANT_CLASSPATH=../tools/lib/ant-launcher.jar
+
+export ANT_OPTS="-Xms128m -Xmx512m -Dworkspace=`pwd`/.."
 
 echo Cleanup ...
-$JAVA_HOME/bin/java $ANT_OPTS -classpath $ANT_CLASSPATH -Dant.home="." org.apache.tools.ant.Main clean
+$JAVA_HOME/bin/java $ANT_OPTS -classpath $ANT_CLASSPATH org.apache.tools.ant.launch.Launcher $ANTLIB clean 
 
 echo Building ...
-$JAVA_HOME/bin/java $ANT_OPTS -classpath $ANT_CLASSPATH -Dant.home="." org.apache.tools.ant.Main -logger org.apache.tools.ant.listener.MailLogger complete
+$JAVA_HOME/bin/java $ANT_OPTS -classpath $ANT_CLASSPATH org.apache.tools.ant.launch.Launcher -logger org.apache.tools.ant.listener.MailLogger $ANTLIB complete
 
 echo Done ...
 
diff --git a/utils_dev/RUN_plugin.sh b/utils_dev/RUN_plugin.sh
new file mode 100755
index 0000000000..f147058e54
--- /dev/null
+++ b/utils_dev/RUN_plugin.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+export ANT_OPTS="-Xms128m -Xmx512m -Dworkspace=`pwd`/.."
+
+ANT4ECLIPSE=../tools/lib/ant4eclipse/
+ANT4OSGI=../equinox-target/org.eclipse.osgi_3.5.0.v20090520.jar
+
+ant -Dplugin=$1 -lib $ANT4ECLIPSE -lib $ANT4OSGI -lib ../tools/lib/ant-contrib-1.0b1.jar plugin
diff --git a/utils_dev/build.properties b/utils_dev/build.properties
index 5ca0f646be..7758bf354f 100644
--- a/utils_dev/build.properties
+++ b/utils_dev/build.properties
@@ -3,7 +3,7 @@ env.ADEMPIERE_ROOT=${env.ADEMPIERE_SOURCE}/adempiere
 env.ADEMPIERE_HOME=${env.ADEMPIERE_ROOT}/Adempiere
 env.ADEMPIERE_INSTALL=${env.ADEMPIERE_SOURCE}/adempiere/install
 env.ADEMPIERE_VERSION=ADempiere
-env.ADEMPIERE_VERSION_FILE=354a
+env.ADEMPIERE_VERSION_FILE=400pr01
 env.ADEMPIERE_VENDOR=ADempiere
 env.ENCODING=UTF-8
 env.XDOCLET_HOME=${env.ADEMPIERE_SOURCE}/tools
diff --git a/utils_dev/build.xml b/utils_dev/build.xml
index ad3347605d..6f23d61776 100644
--- a/utils_dev/build.xml
+++ b/utils_dev/build.xml
@@ -2,7 +2,7 @@
 <!-- Adempiere Build                                   -->
 <!-- ================================================ -->
 <!-- $Header: /cvs/adempiere/utils_dev/build.xml,v 1.4 2006/10/12 00:03:11 jjanke Exp $ -->
-<project name="adempiere" default="complete" basedir="../">
+<project name="adempiere" default="complete" basedir="../" xmlns:ant4eclipse="antlib:org.ant4eclipse">
 	<description>
     This buildfile is used to build the Adempiere system.
   </description>
@@ -31,9 +31,10 @@
 		<ant inheritAll="false" dir="posterita/posterita"/>
 		<ant inheritAll="false" dir="zkwebui"/>
 	</target>
-	<target name="build" depends="jar">
+	<target name="build" depends="plugins">
 		<ant inheritAll="false" dir="install"/>		
 	</target>	
+	
 	<target name="clean">
 		<ant inheritAll="false" dir="tools" target="clean"/>
 		<ant inheritAll="false" dir="base" target="clean"/>
@@ -92,6 +93,32 @@
 		-->
 	</target>
 	
+	<!-- ================================================ -->
+	<!-- Adempiere OSGi Update                            -->
+	<!-- ================================================ -->
+	  <target name="plugin">
+		<buildPlugin workspaceDirectory=".."
+		             projectName="${plugin}"
+		             targetPlatformId="target.platform"
+		             destination="${env.ADEMPIERE_ROOT}/Adempiere/osgi"
+		 			 buildSourceJar="false"
+					 clean="no"/>
+	  </target>		
+
+	<target name="plugins">
+		<ant4eclipse:executeProjectSet workspaceDirectory=".." allWorkspaceProjects="true">
+			<ant4eclipse:forEachProject filter="(executeProjectSet.org.eclipse.pde.PluginNature=*)">
+				<buildPlugin workspaceDirectory=".."
+				             projectName="${executeProjectSet.project.name}"
+				             targetPlatformId="target.platform"
+				             destination="${env.ADEMPIERE_ROOT}/Adempiere/osgi"
+				 			 buildSourceJar="false"
+							 clean="no"/>
+			</ant4eclipse:forEachProject>
+		</ant4eclipse:executeProjectSet>
+	</target>
+
+	
 	<!-- ================================================ -->
 	<!-- Adempiere Local Update                           -->
 	<!-- ================================================ -->
diff --git a/utils_dev/properties.xml b/utils_dev/properties.xml
index be1e2401c9..24a5b3739a 100644
--- a/utils_dev/properties.xml
+++ b/utils_dev/properties.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0'?>
-<project name="properties" basedir=".">
+<project name="properties" basedir="."
+    xmlns:ant4eclipse="antlib:org.ant4eclipse" >
+	
     <description>
         This project file sets all properties needed during build and
         installation. This file is imported in all other build.xml
@@ -14,4 +16,21 @@
 
     <!-- Here we could add most common buildpaths -->
 
+	<!-- ant4eclipse -->
+	
+	<import file="../tools/lib/ant4eclipse/macros/a4e-pde-macros.xml"/>
+	
+	<taskdef uri="antlib:net.sf.antcontrib"
+	        resource="net/sf/antcontrib/antlib.xml" />
+	
+	<taskdef uri="antlib:org.ant4eclipse"
+	        resource="org/ant4eclipse/antlib.xml" />
+
+	<ant4eclipse:jdtClassPathLibrary name="org.eclipse.pde.core.externalJavaSearch">
+	  <fileset dir="."/>
+	</ant4eclipse:jdtClassPathLibrary >
+	
+	<ant4eclipse:targetPlatform id="target.platform"> 
+		<location dir="${workspace}/equinox-target/plugins" />
+	</ant4eclipse:targetPlatform>
 </project>