diff --git a/extend/.classpath b/extend/.classpath
index 883a13797d..3ba5975f01 100644
--- a/extend/.classpath
+++ b/extend/.classpath
@@ -2,11 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/base"/>
-	<classpathentry kind="src" path="/tools"/>
-	<classpathentry exported="true" kind="lib" path="/tools/lib/junit.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/activemq-core-5.0.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="/tools/lib/testing/SuperCSV-with_src-1.52.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/extend/.project b/extend/.project
index 2b91d86796..5537584a19 100644
--- a/extend/.project
+++ b/extend/.project
@@ -10,26 +10,24 @@
 		<project>tools</project>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/extend/META-INF/MANIFEST.MF b/extend/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..dc7783df92
--- /dev/null
+++ b/extend/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.adempiere.extend
+Bundle-SymbolicName: org.adempiere.extend;singleton:=true
+Bundle-Version: 0.0.0.1
+Bundle-ClassPath: extend.jar
+Eclipse-RegisterBuddy: org.adempiere.tools
+Require-Bundle: org.eclipse.osgi.services;bundle-version="3.1.100",
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.adempiere.tools;bundle-version="0.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: compiere.model
+Fragment-Host: org.adempiere.base;bundle-version="0.0.0"
+Eclipse-PatchFragment: true
diff --git a/extend/build.properties b/extend/build.properties
new file mode 100644
index 0000000000..133c2def29
--- /dev/null
+++ b/extend/build.properties
@@ -0,0 +1,6 @@
+output.extend.jar = build
+bin.includes = META-INF/,\
+               extend.jar
+jars.compile.order = extend.jar
+source.extend.jar = src/
+
diff --git a/extend/build.xml b/extend/build.xml
index c29bbf5833..dc250aa56a 100644
--- a/extend/build.xml
+++ b/extend/build.xml
@@ -3,13 +3,15 @@
 <!-- ============================================= -->
 <!-- $Header: /cvs/adempiere/extend/build.xml,v 1.1 2006/04/21 17:55:19 jjanke Exp $ -->
 
-<project name="extend" default="dist" basedir=".">
+<project name="extend" default="plugin" basedir=".">
 
   <description>
-    This buildfile is used to build the extend subproject within 
+    This buildfile is used to build the extend subproject within
     the Adempiere project.
   </description>
 
+  <import file="../utils_dev/properties.xml"/>
+
   <!-- set global properties for this build -->
   <property name="src" value="src"/>
   <property name="build.dir" value="build"/>
@@ -27,51 +29,11 @@
     <pathelement path="../adempiere/Adempiere/lib/Adempiere.jar" />
 	<fileset dir="../tools/lib/testing/">
 		<include name="*.jar"/>
-	</fileset> 
+	</fileset>
   </path>
 
   <target name="init" description="initialization target">
     <echo message="=========== Build Extend"/>
-    <!-- create the time stamp -->
-    <tstamp/>
-    <!-- create the build directory structure used by compile -->
-    <mkdir dir="${build.dir}"/>
-    <!-- check for the distribution directory -->
-    <available file="${dist.dir}" type="dir" property="dist.dir.exists"/>
-  </target>
-
-  <target name="makedir" depends="init" unless="dist.dir.exists">
-    <!-- create the distribution directory if not available -->
-    <mkdir dir="${dist}/${dist.dir}"/>
-  </target>
-  
-  <target name="compile" depends="makedir">
-    <!-- compile the java code from ${src} into ${build.dir} -->
-    <javac target="1.6" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
-      <classpath refid="project.class.path"/>
-    </javac>
-    <!-- copy all image & sound files from src to the build directory -->
-    <copy todir="${build.dir}">
-      <fileset dir="${src}">
-        <include name="**/images/*"/>
-        <include name="**/*.gif"/>
-        <include name="**/*.jpg"/>
-        <include name="**/*.wav"/>
-        <include name="**/*.htm"/>
-        <include name="**/*.html"/>
-        <include name="**/*.properties"/>
-        <exclude name="**/package.html"/>
-      </fileset>
-    </copy>
-  </target>
-
-
-  <!-- =========================================== -->
-  <!-- Distribution                                -->
-  <!-- =========================================== -->
-  <target name="dist" depends="compile">
-    <!-- put everything from ${build.dir} into the ${jar.name}.jar file -->
-    <jar jarfile="${dist.dir}/${jar.name}.jar" basedir="${build.dir}"/>
   </target>
 
   <path id="class.path.test">
@@ -88,7 +50,7 @@
     <!-- pathelement path="/root/RmiJdbc/dist/lib/RmiJdbc.jar" / -->
   </path>
 
-  <target name="functionaltest" depends="dist">
+  <target name="functionaltest" depends="init">
     <junit>
       <classpath refid="class.path.test" />
       <formatter type="brief" usefile="false" />
@@ -106,7 +68,7 @@
     </junit>
   </target>
 
-  <target name="performance.test" depends="dist">
+  <target name="performance.test" depends="init">
     <junit printsummary="no" fork="no" maxmemory="1024m" haltonfailure="yes">
       <!--jvmarg value="-Djava.compiler=NONE"/-->
       <classpath refid="class.path.test" />
@@ -114,18 +76,28 @@
       <test name="test.performance.MProductTest" />
     </junit>
   </target>
-	
-  <target name="run" depends="dist">
+
+  <target name="run" depends="init">
       <java fork="true" classname="test.functional.XMLImportStructureTest">
         <classpath refid="class.path.test" />
       </java>
   </target>
 
 
-  <target name="clean">
-    <!-- Delete the ${build.dir} directory trees -->
-    <delete dir="${build.dir}"/>
-    <delete file="${dist.dir}/${jar.name}.jar" failonerror="false"/>
-  </target>
+	 <target name="plugin" depends="init">
+			<buildPlugin workspaceDirectory="${workspace}"
+			             projectName="extend"
+			             targetPlatformId="target.platform"
+						 destination="../lib"
+			 			 buildSourceJar="false" />
+	  </target>
+
+	  <target name="clean">
+	  	<delete>
+	   		<fileset dir="../lib/plugins">
+				<include name="org.adempiere.extend*.jar"/>
+			</fileset>
+	   	</delete>
+	  </target>
 
 </project>