diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 8f2467fa47..975ea00a98 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -17,12 +17,11 @@ Import-Package: javax.servlet,
  org.slf4j.helpers;version="1.6.1",
  org.slf4j.spi;version="1.6.1"
 DynamicImport-Package: action.images
-Bundle-ClassPath: WEB-INF/classes/,
+Bundle-ClassPath: .,
  WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar,
  WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar,
  WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar,
- WEB-INF/lib/atmosphere-runtime-1.0.4.jar,
- .
+ WEB-INF/lib/atmosphere-runtime-1.0.4.jar
 Export-Package: metainfo.zk,
  org.adempiere.webui,
  org.adempiere.webui.acct,
diff --git a/org.adempiere.ui.zk/build.properties b/org.adempiere.ui.zk/build.properties
index d9633f002f..05f96947e9 100644
--- a/org.adempiere.ui.zk/build.properties
+++ b/org.adempiere.ui.zk/build.properties
@@ -10,7 +10,6 @@ bin.includes = META-INF/,\
                zul/,\
                timeout.zul,\
                plugin.xml,\
-               WEB-INF/classes/,\
                calendar.css,\
                calendar.zul,\
                calendar_mini.zul,\
@@ -49,4 +48,5 @@ src.includes = WEB-INF/classes/,\
                divtab.zul
 source.. = WEB-INF/src/
 bin.excludes = WEB-INF/src/,\
-               WEB-INF/web-2.5.xml
+               WEB-INF/web-2.5.xml,\
+               WEB-INF/classes/