diff --git a/zkwebui/META-INF/MANIFEST.MF b/zkwebui/META-INF/MANIFEST.MF
index d566a0699f..d105818024 100644
--- a/zkwebui/META-INF/MANIFEST.MF
+++ b/zkwebui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: zkwebui
-Bundle-SymbolicName: webui.war;singleton:=true
+Bundle-Name: org.adempiere.webui
+Bundle-SymbolicName: org.adempiere.webui;singleton:=true
 Bundle-Version: 0.0.0.2
 Web-ContextPath: webui
 Bundle-ClassPath: WEB-INF/classes/,
diff --git a/zkwebui/build.properties b/zkwebui/build.properties
index 0644e2bebe..139c16b00e 100644
--- a/zkwebui/build.properties
+++ b/zkwebui/build.properties
@@ -8,7 +8,8 @@ bin.includes = META-INF/,\
                theme/,\
                theme.zs,\
                zul/,\
-               WEB-INF/classes/
+               WEB-INF/classes/,\
+               timeout.zul
 bin.excludes = WEB-INF/src/,\
                WEB-INF/web-2.5.xml
 src.includes = WEB-INF/classes/,\
diff --git a/zkwebui/build.xml b/zkwebui/build.xml
index 749633ea6d..e6f827e01d 100644
--- a/zkwebui/build.xml
+++ b/zkwebui/build.xml
@@ -7,57 +7,18 @@
 	<description>
 	    This buildfile is used to build the Zk WebUI client.
   	</description>
-	<!-- set global properties for this build -->
-	<!--<property environment="env"/>-->
-	<property name="src.dir" value="${basedir}/WEB-INF/src"/>
-	<property name="classes.dir" value="${basedir}/WEB-INF/classes"/>
-	<property name="dist.dir" value="${basedir}/dist"/>
-	<property name="WEBINF.dir" value="${basedir}/WEB-INF"/>
-	<property name="Adempiere.dir" value="${basedir}/../lib"></property>
-
-	<property name="war.name"	value="webui"/>
-	<property name="compile.debug"       value="true"/>
-	<property name="compile.deprecation" value="false"/>
-	<property name="compile.optimize"    value="true"/>
-
-	<path id="compile.classpath">
-		<pathelement location="${basedir}"/>
-	  	<pathelement location="${basedir}/WEB-INF/classes"/>
-	  	<pathelement location="${basedir}/WEB-INF/src"/>
-
-		<pathelement location="${Adempiere.dir}/../base/build"/>
-		<pathelement location="${Adempiere.dir}/../client/build"/>
-		<pathelement location="${Adempiere.dir}/../JasperReports/build"/>
-	    <fileset dir="${Adempiere.dir}">
-	    	<include name="*.jar"/>
-	    </fileset>
-
-	    <pathelement location="${Adempiere.dir}/../tools/lib/servlet-api.jar"/>
-	    <fileset dir="${basedir}/WEB-INF/lib">
-	    	<include name="*.jar"/>
-	    </fileset>
-	</path>
 
 	<target name="clean" description="delete class directory">
-	   <delete dir="${classes.dir}/org" />
-	   <delete dir="${dist.dir}" />
-	</target>
-
-	<target name="compile" depends="clean" description="Compile Java sources">
-	    <mkdir dir="${classes.dir}"/>
-	    <javac target="1.6"
-	    	   srcdir="WEB-INF/src"
-	           destdir="${classes.dir}"
-	           debug="${compile.debug}"
-	     	   deprecation="${compile.deprecation}"
-	           optimize="${compile.optimize}">
-	        <classpath refid="compile.classpath"/>
-	    </javac>
-		<copy  todir="${classes.dir}" overwrite="true">
-			<fileset dir="WEB-INF/src">
-				<include name="**/*.xml" />
+	   <delete>
+	   		<fileset dir="../lib">
+    			<include name="*webui*.jar"/>
 			</fileset>
-		</copy>
+	   </delete>
+	   <delete>
+	   		<fileset dir="${env.ADEMPIERE_ROOT}/Adempiere/osgi">
+    			<include name="*webui*.jar"/>
+			</fileset>
+	   </delete>
 	</target>
 
 	<target name="plugin">
@@ -67,7 +28,6 @@
 			             destination="../lib"
 			 			 buildSourceJar="false"
 						 clean="no"/>
-		<rename dest="../lib/webui.war" src="../lib/webui.jar"/>
 	</target>
 
 	<target name="plugin-dist">
@@ -77,7 +37,5 @@
 			      destination="${env.ADEMPIERE_ROOT}/Adempiere/osgi"
 			 	  buildSourceJar="false"
 				  clean="no"/>
-		<rename dest="${env.ADEMPIERE_ROOT}/Adempiere/osgi/webui.war"
-			src="${env.ADEMPIERE_ROOT}/Adempiere/osgi/webui.jar"/>
 	</target>
 </project>