diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar
index ac305f074..8cb14fb67 100644
Binary files a/lib/installer-exclude/libjitsi.jar and b/lib/installer-exclude/libjitsi.jar differ
diff --git a/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java b/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
index 01721ef5b..6607008e3 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
@@ -346,9 +346,8 @@ void start(BundleContext bc, MetaContactListServiceImpl mclServImpl)
         try
         {
             // load the contact list
-            DocumentBuilderFactory factory =
-                DocumentBuilderFactory.newInstance();
-            DocumentBuilder builder = factory.newDocumentBuilder();
+            DocumentBuilder builder
+                = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
             if (contactlistFile.length() == 0)
             {
                 // if the contact list does not exist - create it.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/ThumbnailElement.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/ThumbnailElement.java
index 3b89bddc7..dbb01107a 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/ThumbnailElement.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/ThumbnailElement.java
@@ -13,6 +13,7 @@
 
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -95,13 +96,11 @@ public ThumbnailElement(String serverAddress,
      */
     public ThumbnailElement(String xml)
     {
-        DocumentBuilderFactory factory =
-            DocumentBuilderFactory.newInstance();
-
           DocumentBuilder builder;
           try
           {
-              builder = factory.newDocumentBuilder();
+              builder
+                  = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
               InputStream in = new ByteArrayInputStream (xml.getBytes());
               Document doc = builder.parse(in);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectCircleJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectCircleJabberImpl.java
index 9dfa9749f..db3cc11bd 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectCircleJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectCircleJabberImpl.java
@@ -16,6 +16,7 @@
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -66,12 +67,10 @@ public WhiteboardObjectCircleJabberImpl ()
      */
     public WhiteboardObjectCircleJabberImpl (String xml)
     {
-        DocumentBuilderFactory factory =
-          DocumentBuilderFactory.newInstance ();
-        DocumentBuilder builder;
         try
         {
-            builder = factory.newDocumentBuilder ();
+            DocumentBuilder builder
+                = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
             InputStream in = new ByteArrayInputStream (xml.getBytes ());
             Document doc = builder.parse (in);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectImageJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectImageJabberImpl.java
index b04263d3e..842dec25e 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectImageJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectImageJabberImpl.java
@@ -15,6 +15,7 @@
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -67,12 +68,10 @@ public WhiteboardObjectImageJabberImpl ()
      */
     public WhiteboardObjectImageJabberImpl (String xml)
     {
-        DocumentBuilderFactory factory =
-          DocumentBuilderFactory.newInstance ();
-        DocumentBuilder builder;
         try
         {
-            builder = factory.newDocumentBuilder ();
+            DocumentBuilder builder
+                = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
             InputStream in = new ByteArrayInputStream (xml.getBytes ());
             Document doc = builder.parse (in);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectLineJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectLineJabberImpl.java
index 55085e132..0301bbbfe 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectLineJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectLineJabberImpl.java
@@ -16,6 +16,7 @@
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -58,12 +59,10 @@ public WhiteboardObjectLineJabberImpl ()
      */
     public WhiteboardObjectLineJabberImpl (String xml)
     {
-        DocumentBuilderFactory factory =
-          DocumentBuilderFactory.newInstance ();
-        DocumentBuilder builder;
         try
         {
-            builder = factory.newDocumentBuilder ();
+            DocumentBuilder builder
+                = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
             InputStream in = new ByteArrayInputStream (xml.getBytes ());
             Document doc = builder.parse (in);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPacketExtension.java
index 1d2e69ced..b43856914 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPacketExtension.java
@@ -13,6 +13,7 @@
 
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.util.xml.*;
 import org.jivesoftware.smack.packet.*;
 import org.w3c.dom.*;
 
@@ -108,12 +109,10 @@ public WhiteboardObjectPacketExtension (
      */
     public  WhiteboardObjectPacketExtension (String xml)
     {
-        DocumentBuilderFactory factory =
-          DocumentBuilderFactory.newInstance ();
-        DocumentBuilder builder;
         try
         {
-            builder = factory.newDocumentBuilder ();
+            DocumentBuilder builder
+                    = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
             InputStream in = new ByteArrayInputStream (xml.getBytes ());
             Document doc = builder.parse (in);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPathJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPathJabberImpl.java
index 3db8cfe7d..0ef35526a 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPathJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPathJabberImpl.java
@@ -18,6 +18,7 @@
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -57,12 +58,10 @@ public WhiteboardObjectPathJabberImpl ()
      */
     public WhiteboardObjectPathJabberImpl (String xml)
     {
-        DocumentBuilderFactory factory =
-          DocumentBuilderFactory.newInstance ();
-        DocumentBuilder builder;
         try
         {
-            builder = factory.newDocumentBuilder ();
+            DocumentBuilder builder
+                    = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
             InputStream in = new ByteArrayInputStream (xml.getBytes ());
             Document doc = builder.parse (in);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolyLineJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolyLineJabberImpl.java
index fd62eca49..b5179be04 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolyLineJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolyLineJabberImpl.java
@@ -17,6 +17,7 @@
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -56,12 +57,10 @@ public WhiteboardObjectPolyLineJabberImpl ()
      */
     public WhiteboardObjectPolyLineJabberImpl (String xml)
     {
-        DocumentBuilderFactory factory =
-          DocumentBuilderFactory.newInstance ();
-        DocumentBuilder builder;
         try
         {
-            builder = factory.newDocumentBuilder ();
+            DocumentBuilder builder
+                    = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
             InputStream in = new ByteArrayInputStream (xml.getBytes ());
             Document doc = builder.parse (in);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolygonJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolygonJabberImpl.java
index 4bc933a10..208b53a0f 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolygonJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolygonJabberImpl.java
@@ -17,6 +17,7 @@
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -66,12 +67,10 @@ public WhiteboardObjectPolygonJabberImpl ()
      */
     public WhiteboardObjectPolygonJabberImpl (String xml)
     {
-        DocumentBuilderFactory factory =
-          DocumentBuilderFactory.newInstance ();
-        DocumentBuilder builder;
         try
         {
-            builder = factory.newDocumentBuilder ();
+            DocumentBuilder builder
+                    = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
             InputStream in = new ByteArrayInputStream (xml.getBytes ());
             Document doc = builder.parse (in);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectRectJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectRectJabberImpl.java
index 34b992df1..d61432080 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectRectJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectRectJabberImpl.java
@@ -16,6 +16,7 @@
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -100,12 +101,10 @@ public WhiteboardObjectRectJabberImpl ( String id,
      */
     public WhiteboardObjectRectJabberImpl (String xml)
     {
-        DocumentBuilderFactory factory =
-          DocumentBuilderFactory.newInstance ();
-        DocumentBuilder builder;
         try
         {
-            builder = factory.newDocumentBuilder ();
+            DocumentBuilder builder
+                    = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
             InputStream in = new ByteArrayInputStream (xml.getBytes ());
             Document doc = builder.parse (in);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectTextJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectTextJabberImpl.java
index e0d1fefe4..7260a209a 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectTextJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectTextJabberImpl.java
@@ -16,6 +16,7 @@
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -71,12 +72,10 @@ public WhiteboardObjectTextJabberImpl ()
      */
     public WhiteboardObjectTextJabberImpl (String xml)
     {
-        DocumentBuilderFactory factory =
-          DocumentBuilderFactory.newInstance ();
-        DocumentBuilder builder;
         try
         {
-            builder = factory.newDocumentBuilder ();
+            DocumentBuilder builder
+                    = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
             InputStream in = new ByteArrayInputStream (xml.getBytes ());
             Document doc = builder.parse (in);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardSessionPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardSessionPacketExtension.java
index 8a303e82e..e53ad558f 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardSessionPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardSessionPacketExtension.java
@@ -13,6 +13,7 @@
 import net.java.sip.communicator.impl.protocol.jabber.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.util.xml.*;
 import org.jivesoftware.smack.packet.*;
 import org.w3c.dom.*;
 
@@ -84,13 +85,10 @@ public WhiteboardSessionPacketExtension (
      */
     public  WhiteboardSessionPacketExtension (String xml)
     {
-        DocumentBuilderFactory factory =
-          DocumentBuilderFactory.newInstance ();
-
-        DocumentBuilder builder;
         try
         {
-            builder = factory.newDocumentBuilder ();
+            DocumentBuilder builder
+                    = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
             InputStream in = new ByteArrayInputStream (xml.getBytes ());
             Document doc = builder.parse (in);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDesktopSharingServerSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDesktopSharingServerSipImpl.java
index 1313b3af1..146e218e9 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDesktopSharingServerSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDesktopSharingServerSipImpl.java
@@ -27,6 +27,7 @@
 import org.jitsi.service.neomedia.MediaType;
 import org.jitsi.service.neomedia.device.*;
 import org.jitsi.service.neomedia.format.*;
+import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 import org.xml.sax.*;
 
@@ -562,9 +563,10 @@ protected void processActiveRequest(RequestEvent requestEvent,
 
                 try
                 {
+                    DocumentBuilderFactory factory
+                        = XMLUtils.newDocumentBuilderFactory();
                     document
-                        = DocumentBuilderFactory.newInstance()
-                            .newDocumentBuilder()
+                        = factory.newDocumentBuilder()
                                 .parse(new ByteArrayInputStream(rawContent));
                 }
                 catch (IOException ioe)
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
index 9abaad642..e8943183d 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
@@ -23,6 +23,7 @@
 import net.java.sip.communicator.util.*;
 
 import org.jitsi.service.fileaccess.*;
+import org.jitsi.util.xml.*;
 import org.osgi.framework.*;
 import org.w3c.dom.*;
 import org.xml.sax.*;
@@ -239,9 +240,8 @@ public void fillTable()
             }
 
             FileInputStream fis = new FileInputStream(localServersListFile);
-            DocumentBuilderFactory factory = DocumentBuilderFactory
-                .newInstance();
-            DocumentBuilder constructor = factory.newDocumentBuilder();
+            DocumentBuilder constructor
+                = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder();
             Document document = constructor.parse(fis);
             Element root = document.getDocumentElement();
 
@@ -311,14 +311,11 @@ public ServerChooserTableModel()
         {
             try
             {
-                // Create a builder factory
-                DocumentBuilderFactory factory
-                    = DocumentBuilderFactory.newInstance();
-
                 // Create the builder and parse the file
-                serverComments = factory.newDocumentBuilder()
-                    .parse(Resources.getPropertyInputStream(
-                        "plugin.jabberaccregwizz.SERVER_COMMENTS"));
+                serverComments
+                    = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder()
+                            .parse(Resources.getPropertyInputStream(
+                                    "plugin.jabberaccregwizz.SERVER_COMMENTS"));
             }
             catch (SAXException e)
             {
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
index 2ad0e968a..e1b222c1e 100755
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
@@ -46,5 +46,6 @@ Import-Package: org.osgi.framework,
  javax.swing.tree,
  javax.swing.undo,
  javax.swing.border,
+ org.jitsi.util.xml,
  org.jivesoftware.smack,
  org.jivesoftware.smack.packet
diff --git a/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java b/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java
index 2641fce92..653dc71c4 100644
--- a/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java
+++ b/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java
@@ -225,8 +225,8 @@ public ConferenceInfoDocument(String xml)
         try
         {
             document
-                    = DocumentBuilderFactory.newInstance().newDocumentBuilder()
-                    .parse(new ByteArrayInputStream(bytes));
+                = XMLUtils.newDocumentBuilderFactory().newDocumentBuilder()
+                        .parse(new ByteArrayInputStream(bytes));
         }
         catch (Exception e)
         {
@@ -401,9 +401,6 @@ public void setSid(String sid)
      * This is not part of RFC4575 and is here because we are temporarily using
      * it in our XMPP implementation.
      * TODO: remote it when we define another way to handle the Jingle SID
-     *
-     * @param sid the value to set the <tt>sid</tt> attribute of the
-     * <tt>conference-info</tt> element to.
      */
     public String getSid()
     {