diff --git a/build.xml b/build.xml
index 47204e71f..010ec12ca 100644
--- a/build.xml
+++ b/build.xml
@@ -2115,26 +2115,14 @@ javax.swing.event, javax.swing.border"/>
 
     <!--BUNDLE-COMMONS-CODEC -->
     <target name="bundle-commons-codec">
-        <jar compress="true" destfile="${bundles.dest}/commons-codec.jar"
-            filesetmanifest="merge">
-
-            <zipfileset src="${lib.noinst}/commons-codec-1.4.jar" prefix=""/>
-            <manifest>
-                <attribute name="System-Bundle" value="yes"/>
-            </manifest>
-        </jar>
+        <copy file="${lib.noinst}/commons-codec-1.4.jar"
+            tofile="${bundles.dest}/commons-codec.jar"/>
     </target>
 
     <!--BUNDLE-COMMONS-LANG -->
     <target name="bundle-commons-lang">
-        <jar compress="true" destfile="${bundles.dest}/commons-lang.jar"
-            filesetmanifest="merge">
-
-            <zipfileset src="${lib.noinst}/commons-lang3-3.1.jar" prefix=""/>
-            <manifest>
-                <attribute name="System-Bundle" value="yes"/>
-            </manifest>
-        </jar>
+        <copy file="${lib.noinst}/commons-lang3-3.1.jar"
+            tofile="${bundles.dest}/commons-lang.jar"/>
     </target>
 
     <!--BUNDLE-HTTPUTIL -->
diff --git a/lib/jitsi-defaults.properties b/lib/jitsi-defaults.properties
index 873b773ad..1e1650794 100644
--- a/lib/jitsi-defaults.properties
+++ b/lib/jitsi-defaults.properties
@@ -153,16 +153,18 @@ net.java.sip.communicator.plugin.pluginmanager.SYSTEM_BUNDLES=\
     net.java.sip.communicator.libjitsi,\
     net.java.sip.communicator.provdisc.mdns,\
     net.java.sip.communicator.plugin.thunderbird,\
+    net.java.sip.communicator.protocol.jabber,\
+    net.java.sip.communicator.plugin.jabberaccregwizz,\
     org.apache.felix.bundlerepository,\
     org.apache.http,\
+    org.apache.httpcomponents.httpclient,\
+    org.apache.httpcomponents.httpcore,\
     org.apache.commons.codec,\
     org.apache.commons.lang3,\
     commons-logging,\
     say.swing,\
     com.sun.jna,\
     com.googlecode.json-simple,\
-    net.java.sip.communicator.protocol.jabber,\
-    net.java.sip.communicator.plugin.jabberaccregwizz,\
     jmork,\
     javax.jmdns,\
     org.jivesoftware.smack,\