diff --git a/client/META-INF/MANIFEST.MF b/client/META-INF/MANIFEST.MF
index ccec30c3b1..2ae61ac6b4 100644
--- a/client/META-INF/MANIFEST.MF
+++ b/client/META-INF/MANIFEST.MF
@@ -198,5 +198,6 @@ Export-Package: com.keypoint,
  org.jfree.util
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.eclipse.core.runtime;bundle-version="3.5.0",
- org.adempiere.tools;bundle-version="0.0.0"
+ org.adempiere.tools;bundle-version="0.0.0",
+ org.adempiere.jbossfacet;bundle-version="0.0.0"
 Bundle-Activator: org.adempiere.client.Activator
diff --git a/client/build.properties b/client/build.properties
index 865179574d..fa5b12cd3f 100644
--- a/client/build.properties
+++ b/client/build.properties
@@ -1,4 +1,4 @@
-source.client.jar = src/
+source.client.jar = src/,build/
 bin.includes = META-INF/,\
                lib/swingx-0.9.0.jar,\
                lib/groovy-all-1.5.1.jar,\
diff --git a/client/build.xml b/client/build.xml
index 49eaad85c4..46ddd0ddc6 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -17,13 +17,24 @@
   <property name="build.dir" value="build"/>
   <property name="dist.dir" value="../lib"/>
   <property name="jar.path" value="../lib"/>
+  <property name="jar.name" value="client.jar"/>
   <!--<property environment="env"/>-->
   <import file="../utils_dev/properties.xml"/>
+  <property name="equinox.target" value="../equinox-target"/>
+  <property name="bundle.name" value="org.adempiere.client"/>
+  <property name="bundle.version" value="0.0.0.2"/>
+	
+  <path id="osgi.libs">
+  	<fileset dir="${equinox.target}/plugins">
+	    <include name="*.jar"/>
+	</fileset>
+  </path>
 
   <!-- set path to include the necessary jar files for javac -->
   <path id="project.class.path">
     <pathelement path="${classpath}"/>
     <pathelement path="${jar.path}/CCTools.jar"/>
+    <path refid="osgi.libs"/>
     <pathelement path="../base/Base.jar"/>
     <pathelement path="../lib/customization.jar"/>
     <pathelement path="../lib/patches.jar"/>
@@ -112,7 +123,14 @@
       </manifest> 
     </jar>
   </target>
-
+	
+  <target name="plugin">
+	<buildPlugin workspaceDirectory=".."
+	             projectName="client"
+	             targetPlatformId="target.platform"
+	             destination="${dist.dir}"
+	 			 buildSourceJar="false" />
+  </target>		
 
   <target name="clean">
     <!-- Delete the ${build.dir} directory trees -->
diff --git a/client/plugin.xml b/client/plugin.xml
index 071f08d40f..4321a36281 100644
--- a/client/plugin.xml
+++ b/client/plugin.xml
@@ -9,5 +9,12 @@
             class="org.compiere.util.ResourceFinder">
       </client>
    </extension>
+   <extension
+         id="org.adempiere.Client"
+         point="org.eclipse.core.runtime.applications">
+         <application>
+         	<run class="org.adempiere.client.Application" />
+		 </application>
+   </extension>
 
 </plugin>
diff --git a/client/src/org/adempiere/client/Activator.java b/client/src/org/adempiere/client/Activator.java
index 36e34f5279..4f4c31bc1c 100644
--- a/client/src/org/adempiere/client/Activator.java
+++ b/client/src/org/adempiere/client/Activator.java
@@ -1,5 +1,7 @@
 package org.adempiere.client;
 
+import java.rmi.RMISecurityManager;
+
 import org.compiere.util.CLogger;
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.Bundle;
@@ -12,8 +14,6 @@ public class Activator extends Plugin {
 
 	@Override
 	public void start(BundleContext context) throws Exception {
-		log.info("Starting client");
-		org.compiere.AdempiereClient.main(new String[]{});
 		activateAll(context.getBundles());
 	}
 
diff --git a/client/src/org/adempiere/client/Application.java b/client/src/org/adempiere/client/Application.java
new file mode 100644
index 0000000000..a58e0870c3
--- /dev/null
+++ b/client/src/org/adempiere/client/Application.java
@@ -0,0 +1,19 @@
+package org.adempiere.client;
+
+import org.compiere.util.CLogger;
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
+
+public class Application implements IApplication {
+	private static CLogger log = CLogger.getCLogger(Application.class);
+
+	public Object start(IApplicationContext ctx) throws Exception {
+		log.info("Starting client");
+		org.compiere.AdempiereClient.main(new String[]{});
+		return IApplication.EXIT_OK;
+	}
+
+	public void stop() {
+	}
+
+}