diff --git a/build.xml b/build.xml
index 6b3fd7859..545d59e7f 100644
--- a/build.xml
+++ b/build.xml
@@ -182,7 +182,7 @@
         <fileset dir="${lib}">
             <include name="*.jar"/>
             <include name="installer-exclude/*.jar"/>
-            <include name="bundles/*.jar"/>
+            <include name="bundle/*.jar"/>
         </fileset>
 
         <fileset dir="${os.lib.home}">
@@ -764,7 +764,7 @@
 
             <!--sysproperty key="net.java.sip.communicator.SC_HOME_DIR_LOCATION"
                     value="${user.home}"/-->
-
+                
             <!-- Setting properties necessary for dependencies on native libs.-->
             <sysproperty key="java.library.path"
                 path="${ld.library.path}:${path}:${dyld.library.path}"/>
diff --git a/ide/nbproject/project.xml b/ide/nbproject/project.xml
index 599dad4a6..0e1e7f790 100644
--- a/ide/nbproject/project.xml
+++ b/ide/nbproject/project.xml
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.ant.freeform</type>
     <configuration>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
-			<!-- Created by Brian Burch on September 27, 2006
+            <!-- Created by Brian Burch on September 27, 2006
 				The master version is held in CVS, as 
 				/ide/nbproject/project.xml.	You should copy it to 
 				/nbproject/project.xml (when NetBeans is not running!)
@@ -89,13 +89,14 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">lib/felix.jar:lib/jdic-all.jar:lib/kxml-min.jar:lib/servicebinder.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/backport-util-concurrent.jar:lib/installer-exclude/bcprov-jdk14-130.jar:lib/installer-exclude/commons-logging.jar:lib/installer-exclude/concurrent.jar:lib/installer-exclude/dnsjava-2.0.3.jar:lib/installer-exclude/JainSipApi1.2.jar:lib/installer-exclude/JainSipRi1.2.jar:lib/installer-exclude/jcalendar-1.3.2.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jmf.jar:lib/installer-exclude/jml-1.0b1.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/retroweaver-rt-2.0.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx-jingle.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/Stun4J.jar:lib/installer-exclude/xalan-2.6.0.jar.ant:lib/installer-exclude/ymsg_network_v0_61.jar:lib/os-specific/linux/installer-exclude/jmf.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/AppleJavaExtensions.jar:lib/os-specific/mac/growl.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/sound.jar</classpath>
-                <source-level>1.4</source-level>
+                <classpath mode="compile">lib/felix.jar:lib/jdic-all.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/backport-util-concurrent.jar:lib/installer-exclude/bcprov-jdk14-130.jar:lib/installer-exclude/commons-logging.jar:lib/installer-exclude/concurrent.jar:lib/installer-exclude/dnsjava-2.0.3.jar:lib/installer-exclude/JainSipApi1.2.jar:lib/installer-exclude/JainSipRi1.2.jar:lib/installer-exclude/jcalendar-1.3.2.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jmf.jar:lib/installer-exclude/jml-1.0b1.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/retroweaver-rt-2.0.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx-jingle.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/Stun4J.jar:lib/installer-exclude/xalan-2.6.0.jar.ant:lib/installer-exclude/ymsg_network_v0_61.jar:lib/os-specific/linux/installer-exclude/jmf.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/AppleJavaExtensions.jar:lib/os-specific/mac/growl.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/sound.jar:lib/installer-exclude/fmj-sc.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/jsch-0.1.33.jar</classpath>
+                <source-level>1.5</source-level>
             </compilation-unit>
             <compilation-unit>
                 <package-root>test</package-root>
                 <unit-tests/>
-                <source-level>1.4</source-level>
+                <classpath mode="compile">lib/felix.jar:lib/bundle/junit.jar:classes:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/Stun4J.jar</classpath>
+                <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>
     </configuration>
diff --git a/lib/bundle/org.apache.felix.bundlerepository-1.0.0.jar b/lib/bundle/org.apache.felix.bundlerepository-1.0.0.jar
new file mode 100644
index 000000000..9bcfe0a45
Binary files /dev/null and b/lib/bundle/org.apache.felix.bundlerepository-1.0.0.jar differ
diff --git a/lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar b/lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar
new file mode 100644
index 000000000..9395501fe
Binary files /dev/null and b/lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar differ
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 88ad72cde..ef929403f 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -1,7 +1,7 @@
 #
 # Framework config properties.
 #
-org.osgi.framework.system.packages= org.osgi.framework; \
+org.osgi.framework.system.packages= org.osgi.framework; ; version=1.3.0, \
  javax.swing; \
  javax.swing.event; \
  javax.swing.table; \
@@ -37,7 +37,8 @@ org.osgi.framework.system.packages= org.osgi.framework; \
  com.apple.eio; \
  org.xml.sax.helpers;
 
-felix.auto.start.10= reference:file:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar
+felix.auto.start.10= reference:file:lib/bundle/org.apache.felix.bundlerepository-1.0.0.jar \
+ reference:file:lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar
 #reference:file:lib/bundle/org.apache.felix.bundlerepository-0.8.0-SNAPSHOT.jar
 #\
 # file:lib/bundle/shell.jar \
diff --git a/lib/felix.jar b/lib/felix.jar
index 6e981e92c..e95cb894c 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 811caa189..09d50b73b 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -37,7 +37,7 @@ org.osgi.framework.system.packages= org.osgi.framework; \
 # file:lib/bundle/tablelayout.jar \
 #
 
-felix.auto.start.1= file:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar \
+felix.auto.start.1= file:lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar \
  file:lib/bundle/junit.jar
 # file:lib/bundle/shell.jar \
 # file:lib/bundle/bundlerepository.jar \
diff --git a/lib/kxml-min.jar b/lib/kxml-min.jar
deleted file mode 100644
index 9607a8a73..000000000
Binary files a/lib/kxml-min.jar and /dev/null differ
diff --git a/lib/servicebinder.jar b/lib/servicebinder.jar
deleted file mode 100644
index bfe2e406d..000000000
Binary files a/lib/servicebinder.jar and /dev/null differ
diff --git a/resources/install/debian/sip-communicator.sh.tmpl b/resources/install/debian/sip-communicator.sh.tmpl
index 5a13f056e..760ebb50b 100644
--- a/resources/install/debian/sip-communicator.sh.tmpl
+++ b/resources/install/debian/sip-communicator.sh.tmpl
@@ -32,6 +32,6 @@ cd $SCDIR
 
 if [ -f $javabin ]
 then
-        $javabin -classpath	"$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/kxml-min.jar:$LIBPATH/servicebinder.jar:$LIBPATH/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:$SCDIR/sc-bundles/util.jar" -Dfelix.config.properties=file:$LIBPATH/felix.client.run.properties -Djava.util.logging.config.file=$LIBPATH/logging.properties org.apache.felix.main.Main
+        $javabin -classpath	"$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$SCDIR/sc-bundles/util.jar" -Dfelix.config.properties=file:$LIBPATH/felix.client.run.properties -Djava.util.logging.config.file=$LIBPATH/logging.properties org.apache.felix.main.Main
         exit $?
 fi
diff --git a/resources/install/generic/run.sh b/resources/install/generic/run.sh
index e298f813e..9646cbd69 100644
--- a/resources/install/generic/run.sh
+++ b/resources/install/generic/run.sh
@@ -1,4 +1,4 @@
 mkdir -p $HOME/.sip-communicator/log
 
 export PATH=$PATH:native
-java -classpath "lib/jdic-all.jar:lib/jdic_stub.jar:lib/felix.jar:lib/kxml-min.jar:lib/servicebinder.jar:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:sc-bundles/util.jar" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
+java -classpath "lib/jdic-all.jar:lib/jdic_stub.jar:lib/felix.jar:sc-bundles/util.jar" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
diff --git a/resources/install/linux/run.sh b/resources/install/linux/run.sh
index 2caf50da0..944205efc 100755
--- a/resources/install/linux/run.sh
+++ b/resources/install/linux/run.sh
@@ -2,4 +2,4 @@ mkdir -p $HOME/.sip-communicator/log
 
 export PATH=$PATH:native
 export JAVA_HOME=jre
-${JAVA_HOME}/bin/java -classpath "lib/jdic-all.jar:lib/jdic_stub.jar:lib/felix.jar:lib/kxml-min.jar:lib/servicebinder.jar:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:sc-bundles/util.jar" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
+${JAVA_HOME}/bin/java -classpath "lib/jdic-all.jar:lib/jdic_stub.jar:lib/felix.jar:sc-bundles/util.jar" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
diff --git a/resources/install/windows/run.bat b/resources/install/windows/run.bat
index 22a4d392e..f1fce5d16 100755
--- a/resources/install/windows/run.bat
+++ b/resources/install/windows/run.bat
@@ -1,3 +1,4 @@
 mkdir "%UserProfile%/.sip-communicator/log"
 set PATH=%PATH%;native
-start javaw -classpath "lib/jdic-all.jar;lib/jdic_stub.jar;lib/felix.jar;lib/kxml-min.jar;lib/servicebinder.jar;lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar;sc-bundles/util.jar" -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
+start javaw -classpath "lib/jdic-all.jar;lib/jdic_stub.jar;lib/felix.jar;sc-bundles/util.jar" -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
+servicebin
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/impl/fileaccess/FileAccessActivator.java b/src/net/java/sip/communicator/impl/fileaccess/FileAccessActivator.java
index 34c0e82dc..fc0912380 100644
--- a/src/net/java/sip/communicator/impl/fileaccess/FileAccessActivator.java
+++ b/src/net/java/sip/communicator/impl/fileaccess/FileAccessActivator.java
@@ -1,6 +1,6 @@
 package net.java.sip.communicator.impl.fileaccess;
 
-import org.ungoverned.gravity.servicebinder.*;
+import org.apache.felix.servicebinder.GenericActivator;
 
 /**
  * Invoke "Service Binder" to parse the service XML and register all services.
diff --git a/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
index ae8ce4b37..a6d3d571d 100644
--- a/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
+++ b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
@@ -4,6 +4,7 @@ Bundle-Description: A bundle that implements the file access package.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
+ org.apache.felix.servicebinder,
  org.xml.sax,
  org.w3c.dom,
  javax.xml.transform,
diff --git a/src/net/java/sip/communicator/impl/history/HistoryActivator.java b/src/net/java/sip/communicator/impl/history/HistoryActivator.java
index 01664c6a4..db7845f42 100644
--- a/src/net/java/sip/communicator/impl/history/HistoryActivator.java
+++ b/src/net/java/sip/communicator/impl/history/HistoryActivator.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.impl.history;
 
-import org.ungoverned.gravity.servicebinder.*;
+import org.apache.felix.servicebinder.GenericActivator;
 
 /**
  * Invoke "Service Binder" to parse the service XML and register all services.
diff --git a/src/net/java/sip/communicator/impl/history/history.manifest.mf b/src/net/java/sip/communicator/impl/history/history.manifest.mf
index 3a5ceb6e0..7a9d0726c 100644
--- a/src/net/java/sip/communicator/impl/history/history.manifest.mf
+++ b/src/net/java/sip/communicator/impl/history/history.manifest.mf
@@ -4,6 +4,7 @@ Bundle-Description: A bundle that implements the history package.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
+ org.apache.felix.servicebinder,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.fileaccess,
  net.java.sip.communicator.service.history,
diff --git a/src/net/java/sip/communicator/impl/media/device/JmfDeviceDetector.java b/src/net/java/sip/communicator/impl/media/device/JmfDeviceDetector.java
index 145913892..4a41fb214 100644
--- a/src/net/java/sip/communicator/impl/media/device/JmfDeviceDetector.java
+++ b/src/net/java/sip/communicator/impl/media/device/JmfDeviceDetector.java
@@ -166,19 +166,29 @@ private void detectCaptureDevices()
         }
 
         //Linux
-        try
-        {
-            V4LAuto v4lAuto = new V4LAuto();
-            nDevices = v4lAuto.autoDetectDevices();
-            logger.info("Detected "
-                        + nDevices
-                        +" V4L video capture device.");
-        }
-        catch (Throwable exc)
-        {
-            logger.debug("No V4l video detected: " + exc.getMessage());
-        }
-
+//        try
+//        {
+//            V4LAuto v4lAuto = new V4LAuto();
+//            nDevices = v4lAuto.autoDetectDevices();
+//            logger.info("Detected "
+//                        + nDevices
+//                        +" V4L video capture device.");
+//        }
+//        catch (Throwable exc)
+//        {
+//            logger.debug("No V4l video detected: " + exc.getMessage());
+//        }
+        
+//        try
+//        {
+//            new net.sf.fmj.media.cdp.civil.CaptureDevicePlugger().
+//                    addCaptureDevices();
+//            CaptureDeviceManager.commit();
+//        }
+//        catch (Throwable exc)
+//        {
+//            logger.debug("No civil video detected: ", exc);
+//        }
     }
 
     private void detectDirectAudio()
diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf
index 36c9ec889..07157f60e 100644
--- a/src/net/java/sip/communicator/util/util.manifest.mf
+++ b/src/net/java/sip/communicator/util/util.manifest.mf
@@ -3,7 +3,8 @@ Bundle-Name: SIP Communicator Utility Packages
 Bundle-Description: A bundle that export packages with utility classes.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-Import-Package: org.w3c.dom,
+Import-Package: org.osgi.framework,
+ org.w3c.dom,
  org.xml.sax,
  javax.xml.parsers,
  org.apache.xml.serialize,
diff --git a/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf b/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
index 42ec93907..efec7bdca 100644
--- a/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
@@ -4,6 +4,7 @@ Bundle-Description: A Service Implementation Compatibility Kit for the Media Ser
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
+ junit.framework,
  net.java.sip.communicator.slick.media,
  net.java.sip.communicator.service.media,
  net.java.sip.communicator.service.media.event,