diff --git a/build/projects/Smack.iml b/build/projects/Smack.iml
index 41776e4f0..ed746d8a8 100644
--- a/build/projects/Smack.iml
+++ b/build/projects/Smack.iml
@@ -47,9 +47,7 @@
           <root url="jar://$MODULE_DIR$/../build/xmlunit.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/../../../xmlunit-1.1beta1/src/java" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
diff --git a/jingle/extension/build/merge/javapng-2.0-rc6.jar b/jingle/extension/build/merge/javapng-2.0-rc6.jar
deleted file mode 100644
index f622b37c9..000000000
Binary files a/jingle/extension/build/merge/javapng-2.0-rc6.jar and /dev/null differ
diff --git a/jingle/extension/build/projects/JingleExtension.iml b/jingle/extension/build/projects/JingleExtension.iml
index 2f898249b..9ff009593 100644
--- a/jingle/extension/build/projects/JingleExtension.iml
+++ b/jingle/extension/build/projects/JingleExtension.iml
@@ -22,15 +22,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../merge/jstun-0.6.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -41,7 +32,42 @@
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="Smack" />
-    <orderEntry type="module" module-name="JingleMedia" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../merge/jstun.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/Speex.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/jspeex-0.9.7-jfcom.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/jmf.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="VcsManagerConfiguration">
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java
index 517e9cfa4..421f2278e 100644
--- a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java
+++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java
@@ -1,27 +1,16 @@
 package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
 
-import com.sixlegs.png.PngImage;
-
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
 /**
- * Implements a default PNG Decoder
+ * Implements a default PNG decoder.
  */
-public class DefaultDecoder implements ImageDecoder{
+public class DefaultDecoder implements ImageDecoder {
 
-    PngImage decoder = new PngImage();
-
-    public BufferedImage decode(ByteArrayInputStream stream) {
-        BufferedImage image = null;
-        try {
-            image = decoder.read(stream,true);
-        }
-        catch (IOException e) {
-            e.printStackTrace();
-            // Do nothing
-        }
-        return image;
+    public BufferedImage decode(ByteArrayInputStream stream) throws IOException {
+        return ImageIO.read(stream);
     }
 }
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java
index 1d71c02e4..6181d1346 100644
--- a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java
+++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java
@@ -2,6 +2,7 @@ package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 
 /**
  * Image Decoder Interface use this interface if you want to change the default decoder
@@ -9,5 +10,6 @@ import java.io.ByteArrayInputStream;
  * @author Thiago Rocha Camargo
  */
 public interface ImageDecoder {
-    public BufferedImage decode(ByteArrayInputStream stream);
+
+    public BufferedImage decode(ByteArrayInputStream stream) throws IOException;
 }