diff --git a/lib/bundle/org.apache.felix.bundlerepository-1.0.0.jar b/lib/bundle/org.apache.felix.bundlerepository-1.0.0.jar
deleted file mode 100644
index f157f8235..000000000
Binary files a/lib/bundle/org.apache.felix.bundlerepository-1.0.0.jar and /dev/null differ
diff --git a/lib/bundle/org.apache.felix.bundlerepository-1.4.2.jar b/lib/bundle/org.apache.felix.bundlerepository-1.4.2.jar
new file mode 100644
index 000000000..ab4aed39d
Binary files /dev/null and b/lib/bundle/org.apache.felix.bundlerepository-1.4.2.jar differ
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 75b4fe65c..63724cc73 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -1,39 +1,10 @@
 #
 # Framework config properties.
 #
-org.osgi.framework.system.packages.extra= org.osgi.framework; version=1.3.0, \
- javax.swing; \
- javax.swing.event; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.accessibility; \
- javax.swing.plaf; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.basic; \
- javax.imageio; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.swing.event; \
- javax.swing.border; \
- javax.swing.filechooser; \
- org.w3c.dom; \
- org.xml.sax; \
- org.xml.sax.ext; \
- javax.xml.parsers;\
+org.osgi.framework.system.packages.extra= \
  org.apache.xml.serialize; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.stream; \
  sun.security.action; \
  sun.misc; \
- javax.net; \
- javax.net.ssl; \
- javax.naming; \
- javax.naming.directory; \
- javax.sound;\
- javax.sound.sampled; \
  org.jdesktop.jdic.tray; \
  org.jdesktop.jdic.desktop; \
  com.apple.cocoa.application; \
@@ -45,23 +16,12 @@ org.osgi.framework.system.packages.extra= org.osgi.framework; version=1.3.0, \
  quicktime.qd; \
  quicktime.util; \
  quicktime.std.image; \
- org.xml.sax.helpers; \
  net.java.sip.communicator.util.launchutils; \
- javax.crypto; \
- javax.crypto.spec; \
- javax.crypto.interfaces; \
  sun.awt.shell; \
- sun.net.util; \
- java.io; \
- java.math; \
- java.nio; \
- java.security; \
- java.security.interfaces; \
- java.security.spec;
-
+ sun.net.util;
 
 felix.auto.start.10= \
- reference:file:lib/bundle/org.apache.felix.bundlerepository-1.0.0.jar
+ reference:file:lib/bundle/org.apache.felix.bundlerepository-1.4.2.jar
 # file:lib/bundle/shell.jar \
 # file:lib/bundle/servicebinder.jar \
 # file:lib/bundle/tablelayout.jar
@@ -189,13 +149,5 @@ felix.auto.start.80= \
 #Specify the directory where oscar should deploy its bundles
 org.osgi.framework.storage=${net.java.sip.communicator.SC_HOME_DIR_LOCATION}/${net.java.sip.communicator.SC_HOME_DIR_NAME}/sip-communicator.bin
 
-org.osgi.framework.startlevel=100
-felix.startlevel.framework=100
+org.osgi.framework.startlevel.beginning=100
 felix.startlevel.bundle=100
-#
-# Bundle config properties.
-#
-#org.osgi.service.http.port=8080
-#osgi.shell.telnet=on
-#oscar.repository.url=file:/home/rickhall/projects/noscar/repository.xml
-oscar.embedded.execution=false
diff --git a/lib/felix.jar b/lib/felix.jar
index e8db9ade4..ed5d3c61d 100644
Binary files a/lib/felix.jar and b/lib/felix.jar differ
diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties
index f8da6c919..3dd6a4d88 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -3,40 +3,17 @@
 # This file configures the OSCAR framework to run sip-communicator unit tests
 # and Service Implementation Compatibility Kits
 #
-org.osgi.framework.system.packages.extra= org.osgi.framework; ; version=1.3.0, \
- javax.swing; \
- javax.swing.event; \
- javax.swing.border; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.imageio;\
- org.w3c.dom; \
- org.xml.sax; \
- org.xml.sax.helpers; \
- org.xml.sax.ext; \
+org.osgi.framework.system.packages.extra= \
  sun.misc; \
  sun.security.action; \
- javax.xml.parsers;\
  org.apache.xml.serialize;\
- javax.xml.transform;\
- javax.xml.transform.dom;\
- javax.xml.transform.stream;\
  net.java.stun4j;\
  net.java.stun4j.client;\
- javax.sound;\
- javax.sound.sampled; \
  quicktime; \
  quicktime.std.sg; \
  quicktime.qd; \
  quicktime.util; \
  quicktime.std.image; \
- javax.naming; \
- javax.naming.directory; \
- javax.net; \
- javax.net.ssl; \
  gnu.java.zrtp; \
  gnu.java.zrtp.packets; \
  gnu.java.zrtp.utils; \
@@ -45,17 +22,8 @@ org.osgi.framework.system.packages.extra= org.osgi.framework; ; version=1.3.0, \
  org.jdesktop.jdic.tray; \
  org.jdesktop.jdic.desktop; \
  com.apple.cocoa.application; \
- javax.crypto; \
- javax.crypto.spec; \
- javax.crypto.interfaces; \
  sun.awt.shell; \
- sun.net.util; \
- java.io; \
- java.math; \
- java.nio; \
- java.security; \
- java.security.interfaces; \
- java.security.spec;
+ sun.net.util;
 
 
 #
@@ -145,9 +113,6 @@ felix.auto.start.100= \
 #Specify the directory where oscar should deploy its bundles
 org.osgi.framework.storage=sip-communicator.utest.bin
 
-org.osgi.framework.startlevel=100
+org.osgi.framework.startlevel.beginning=100
 
-felix.startlevel.framework=100
 felix.startlevel.bundle=100
-
-felix.embedded.execution=true
diff --git a/lib/installer-exclude/jml-1.0b2.jar b/lib/installer-exclude/jml-1.0b2.jar
index 791378619..8499d1b09 100644
Binary files a/lib/installer-exclude/jml-1.0b2.jar and b/lib/installer-exclude/jml-1.0b2.jar differ
diff --git a/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf b/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf
index dac67e991..a0de0bbc6 100644
--- a/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf
+++ b/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf
@@ -12,7 +12,6 @@ Import-Package: org.osgi.framework,
  org.bouncycastle.crypto.params,
  org.bouncycastle.crypto.engines,
  javax.imageio,
- javax.sound,
  javax.sound.sampled,
  javax.swing,
  javax.swing.border,