diff --git a/org.adempiere.server/.classpath b/org.adempiere.server/.classpath
index 77eb40a8f3..71aca4aa41 100644
--- a/org.adempiere.server/.classpath
+++ b/org.adempiere.server/.classpath
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jnlp-jardiff.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jnlp-servlet.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/main/server"/>
 	<classpathentry kind="src" path="src/main/servlet"/>
 	<classpathentry kind="src" path="src/main/home"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jardiff.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jnlp-servlet.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF
index 9562413fd3..f2dfea2b31 100644
--- a/org.adempiere.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.server/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Web-ContextPath: /
 Bundle-ClassPath: .,
- WEB-INF/lib/jardiff.jar,
+ WEB-INF/lib/jnlp-jardiff.jar,
  WEB-INF/lib/jnlp-servlet.jar
 Import-Package: javax.jms;version="1.1.0",
  javax.mail;version="1.5",
diff --git a/org.adempiere.server/build.properties b/org.adempiere.server/build.properties
index c563e2fc86..a975cce5e8 100644
--- a/org.adempiere.server/build.properties
+++ b/org.adempiere.server/build.properties
@@ -1,7 +1,5 @@
 bin.includes = META-INF/,\
                .,\
-               WEB-INF/lib/jardiff.jar,\
-               WEB-INF/lib/jnlp-servlet.jar,\
                WEB-INF/web.xml,\
                iDempiere120x60.gif,\
                iD32.gif,\
@@ -29,7 +27,9 @@ bin.includes = META-INF/,\
                OSGI-INF/workflowprocessorfactory.xml,\
                OSGI-INF/,\
                resources/,\
-               idempiere.jsp
+               idempiere.jsp,\
+               WEB-INF/lib/jnlp-jardiff.jar,\
+               WEB-INF/lib/jnlp-servlet.jar
 output.. = target/classes/
 source.. = src/main/server/,\
            src/main/servlet/,\
diff --git a/org.adempiere.server/copyjars.xml b/org.adempiere.server/copyjars.xml
index 0eff2a9b24..db49e5bf2b 100644
--- a/org.adempiere.server/copyjars.xml
+++ b/org.adempiere.server/copyjars.xml
@@ -1,7 +1,7 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="WEB-INF/lib" />
-		<get src="${url.file.srv}/jarfile/5.1/jardiff.jar" dest="WEB-INF/lib/jardiff.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/jnlp-servlet.jar" dest="WEB-INF/lib/jnlp-servlet.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.opennms}/javax/samples/jnlp/jnlp-jardiff/1.6.0/jnlp-jardiff-1.6.0.jar" dest="WEB-INF/lib/jnlp-jardiff.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.opennms}/javax/samples/jnlp/jnlp-servlet/1.6.0/jnlp-servlet-1.6.0.jar" dest="WEB-INF/lib/jnlp-servlet.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath
index 1fa508077c..4a20681f55 100644
--- a/org.idempiere.webservices/.classpath
+++ b/org.idempiere.webservices/.classpath
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="WEB-INF/src/"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/aopalliance.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/axis.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/commons-discovery.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-bundle.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-rt-frontend-jaxws.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/idempiere-xmlbeans.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jsr311-api.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/neethi.jar"/>
@@ -23,5 +20,8 @@
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/wsdl4j.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlbeans.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlschema-core.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="WEB-INF/src/"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index fd61a21356..7948bb1196 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -66,8 +66,8 @@ Bundle-ClassPath: .,
  WEB-INF/lib/aopalliance.jar,
  WEB-INF/lib/axis.jar,
  WEB-INF/lib/commons-discovery.jar,
+ WEB-INF/lib/cxf-bundle.jar,
  WEB-INF/lib/cxf-rt-frontend-jaxws.jar,
- WEB-INF/lib/cxf.jar,
  WEB-INF/lib/idempiere-xmlbeans.jar,
  WEB-INF/lib/jsr311-api.jar,
  WEB-INF/lib/neethi.jar,
diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties
index d3ff9cd621..1fd4677baa 100644
--- a/org.idempiere.webservices/build.properties
+++ b/org.idempiere.webservices/build.properties
@@ -9,8 +9,8 @@ bin.includes = META-INF/,\
                WEB-INF/lib/aopalliance.jar,\
                WEB-INF/lib/axis.jar,\
                WEB-INF/lib/commons-discovery.jar,\
+               WEB-INF/lib/cxf-bundle.jar,\
                WEB-INF/lib/cxf-rt-frontend-jaxws.jar,\
-               WEB-INF/lib/cxf.jar,\
                WEB-INF/lib/idempiere-xmlbeans.jar,\
                WEB-INF/lib/jsr311-api.jar,\
                WEB-INF/lib/neethi.jar,\
diff --git a/org.idempiere.webservices/copyjars.xml b/org.idempiere.webservices/copyjars.xml
index e1a80f0f23..dce1c7157b 100644
--- a/org.idempiere.webservices/copyjars.xml
+++ b/org.idempiere.webservices/copyjars.xml
@@ -11,7 +11,7 @@
         <get src="${url.maven2}/org/springframework/spring-asm/3.0.7.RELEASE/spring-asm-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-asm.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/org/springframework/spring-expression/3.0.7.RELEASE/spring-expression-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-expression.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar" dest="WEB-INF/lib/wsdl4j.jar" usetimestamp="true" verbose="true" retries="5" />
-        <get src="${url.maven2}/org/apache/cxf/cxf-bundle/2.6.2/cxf-bundle-2.6.2.jar" dest="WEB-INF/lib/cxf.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.maven2}/org/apache/cxf/cxf-bundle/2.6.2/cxf-bundle-2.6.2.jar" dest="WEB-INF/lib/cxf-bundle.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/org/apache/neethi/neethi/3.0.2/neethi-3.0.2.jar" dest="WEB-INF/lib/neethi.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3.jar" dest="WEB-INF/lib/xmlschema-core.jar" usetimestamp="true" verbose="true" retries="5" />
         <get src="${url.maven2}/org/apache/cxf/cxf-rt-frontend-jaxws/2.6.1/cxf-rt-frontend-jaxws-2.6.1.jar" dest="WEB-INF/lib/cxf-rt-frontend-jaxws.jar" usetimestamp="true" verbose="true" retries="5" />