diff --git a/zkwebui/.classpath b/zkwebui/.classpath
index 52cc6002bc..d943a9229d 100644
--- a/zkwebui/.classpath
+++ b/zkwebui/.classpath
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="WEB-INF/src"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/classes/"/>
-	<classpathentry kind="src" path="/base"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/asm.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/bsh.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/commons-el.jar"/>
@@ -27,17 +26,12 @@
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zul.jar" sourcepath="WEB-INF/lib/zul-sources.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/junit.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/keylistener.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/tools"/>
-	<classpathentry kind="src" path="/client"/>
-	<classpathentry kind="src" path="/JasperReports"/>
-	<classpathentry kind="src" path="/JasperReportsTools"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/zkmax.jar" sourcepath="WEB-INF/lib/zkmax-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zkex.jar" sourcepath="WEB-INF/lib/zkex-sources.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/zkplus.jar" sourcepath="WEB-INF/lib/zkplus-sources.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/zhtml.jar" sourcepath="WEB-INF/lib/zhtml-sources.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/timelinez.jar" sourcepath="WEB-INF/lib/timelinez-sources.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/zweb.jar" sourcepath="WEB-INF/lib/zweb-sources.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/extend"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/cglib.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/fckez.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
diff --git a/zkwebui/META-INF/MANIFEST.MF b/zkwebui/META-INF/MANIFEST.MF
index d105818024..43b227b48c 100644
--- a/zkwebui/META-INF/MANIFEST.MF
+++ b/zkwebui/META-INF/MANIFEST.MF
@@ -370,9 +370,10 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="3.1.100",
  org.apache.xerces;bundle-version="2.9.0",
  org.apache.xml.serializer;bundle-version="2.7.1",
  com.springsource.javax.servlet;bundle-version="2.5.0",
- JasperReports;bundle-version="1.0.0",
+ org.adempiere.JasperReports;bundle-version="1.0.0",
  org.adempiere.client;bundle-version="0.0.0",
  org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.tools;bundle-version="0.0.0",
  org.adempiere.JasperReportsTools;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-ExtensibleAPI: true
diff --git a/zkwebui/build.xml b/zkwebui/build.xml
index e6f827e01d..ae9cbadd78 100644
--- a/zkwebui/build.xml
+++ b/zkwebui/build.xml
@@ -3,39 +3,27 @@
 <!-- Zk Ajax UI (Web UI)                               -->
 <!-- ======================================================== -->
 
-<project name="ZkWebUI" default="plugin-dist" basedir=".">
+<project name="ZkWebUI" default="plugin" basedir=".">
 	<description>
 	    This buildfile is used to build the Zk WebUI client.
   	</description>
 
+	<import file="../utils_dev/properties.xml"/>
+
 	<target name="clean" description="delete class directory">
 	   <delete>
-	   		<fileset dir="../lib">
-    			<include name="*webui*.jar"/>
-			</fileset>
-	   </delete>
-	   <delete>
-	   		<fileset dir="${env.ADEMPIERE_ROOT}/Adempiere/osgi">
+	   		<fileset dir="../lib/plugins">
     			<include name="*webui*.jar"/>
 			</fileset>
 	   </delete>
 	</target>
 
 	<target name="plugin">
-		<buildPlugin workspaceDirectory=".."
-			             projectName="webui"
+		<buildPlugin workspaceDirectory="${workspace}"
+			             projectName="zkwebui"
 			             targetPlatformId="target.platform"
 			             destination="../lib"
 			 			 buildSourceJar="false"
 						 clean="no"/>
 	</target>
-
-	<target name="plugin-dist">
-		<buildPlugin workspaceDirectory=".."
-			      projectName="webui"
-			      targetPlatformId="target.platform"
-			      destination="${env.ADEMPIERE_ROOT}/Adempiere/osgi"
-			 	  buildSourceJar="false"
-				  clean="no"/>
-	</target>
 </project>