diff --git a/lib/native/linux-64/libcivil.so b/lib/native/linux-64/libcivil.so
index 5d95ac93e..1a4b39ae9 100755
Binary files a/lib/native/linux-64/libcivil.so and b/lib/native/linux-64/libcivil.so differ
diff --git a/lib/native/linux/libcivil.so b/lib/native/linux/libcivil.so
index eff9564e8..d0d3b7a35 100755
Binary files a/lib/native/linux/libcivil.so and b/lib/native/linux/libcivil.so differ
diff --git a/src/net/java/sip/communicator/impl/media/MediaControl.java b/src/net/java/sip/communicator/impl/media/MediaControl.java
index 4db445b46..81dcbb851 100644
--- a/src/net/java/sip/communicator/impl/media/MediaControl.java
+++ b/src/net/java/sip/communicator/impl/media/MediaControl.java
@@ -180,6 +180,9 @@ public void propertyChange(PropertyChangeEvent evt)
     private void initCaptureDevices()
         throws MediaException
     {
+        if (avDataSource != null)
+            avDataSource.disconnect();
+
         // Init Capture devices
         DataSource audioDataSource = null;
         DataSource videoDataSource = null;