diff -Naur icedtea6-1.10.4/Makefile.am icedtea6-1.10.4-magellan/Makefile.am
--- icedtea6-1.10.4/Makefile.am	2011-10-13 18:27:35.063986484 +0200
+++ icedtea6-1.10.4-magellan/Makefile.am	2012-01-05 17:21:09.701981562 +0100
@@ -1275,7 +1275,11 @@
 	ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \
 	ln -sf $(XALAN2_SERIALIZER_JAR) \
 	  $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \
-	ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar
+	ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar && \
+	if test -f "$(XML_APIS_JAR)"; then \
+	    ln -sf $(XML_APIS_JAR) \
+	           $(ECJ_BOOT_DIR)/lib/endorsed/xml-apis.jar; \
+	fi
 	mkdir -p $(ECJ_BOOT_DIR)/jre/lib && \
 	cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar && \
 	ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
diff -Naur icedtea6-1.10.4/Makefile.in icedtea6-1.10.4-magellan/Makefile.in
--- icedtea6-1.10.4/Makefile.in	2011-10-13 19:39:49.922906360 +0200
+++ icedtea6-1.10.4-magellan/Makefile.in	2012-01-05 17:22:18.592981561 +0100
@@ -296,6 +296,7 @@
 XERCES2_JAR = @XERCES2_JAR@
 XINERAMA_CFLAGS = @XINERAMA_CFLAGS@
 XINERAMA_LIBS = @XINERAMA_LIBS@
+XML_APIS_JAR = @XML_APIS_JAR@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XP_CFLAGS = @XP_CFLAGS@
@@ -1703,7 +1704,11 @@
 	ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \
 	ln -sf $(XALAN2_SERIALIZER_JAR) \
 	  $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \
-	ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar
+	ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar && \
+	if test -f "$(XML_APIS_JAR)"; then \
+	    ln -sf $(XML_APIS_JAR) \
+	           $(ECJ_BOOT_DIR)/lib/endorsed/xml-apis.jar; \
+	fi
 	mkdir -p $(ECJ_BOOT_DIR)/jre/lib && \
 	cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar && \
 	ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
diff -Naur icedtea6-1.10.4/acinclude.m4 icedtea6-1.10.4-magellan/acinclude.m4
--- icedtea6-1.10.4/acinclude.m4	2011-07-11 23:43:43.361068652 +0200
+++ icedtea6-1.10.4-magellan/acinclude.m4	2012-01-05 17:19:36.389981559 +0100
@@ -556,7 +556,7 @@
 [
   AC_MSG_CHECKING(for endorsed jars dir)
   AC_ARG_WITH([endorsed-dir],
-              [AS_HELP_STRING(--with-endorsed-dir,specify directory of endorsed jars (xalan-j2.jar, xalan-j2-serializer.jar, xerces-j2.jar))],
+              [AS_HELP_STRING(--with-endorsed-dir,specify directory of endorsed jars (xalan-j2.jar, xalan-j2-serializer.jar, xerces-j2.jar, xml-apis.jar))],
   [
     if test "x${withval}" = "xno"; then
         ENDORSED_JARS="${withval}"
@@ -564,8 +564,10 @@
     else if test -f "${withval}/xalan-j2.jar"; then
       if test -f "${withval}/xalan-j2-serializer.jar"; then
         if test -f "${withval}/xerces-j2.jar"; then
+          if test -f "${withval}/xml-apis.jar"; then
           ENDORSED_JARS="${withval}"
           AC_MSG_RESULT(${withval})
+          fi
         fi
       fi
     fi
@@ -577,8 +579,10 @@
     if test -f "/usr/share/java/xalan-j2.jar"; then
       if test -f "/usr/share/java/xalan-j2-serializer.jar"; then
         if test -f "/usr/share/java/xerces-j2.jar"; then
-          ENDORSED_JARS="/usr/share/java/xalan-j2.jar /usr/share/java/xalan-j2-serializer.jar /usr/share/java/xerces-j2.jar"
+          if test -f "/usr/share/java/xml-apis.jar"; then
+          ENDORSED_JARS="/usr/share/java/xalan-j2.jar /usr/share/java/xalan-j2-serializer.jar /usr/share/java/xerces-j2.jar /usr/share/java/xml-apis.jar"
           AC_MSG_RESULT(/usr/share/java)
+          fi
         fi
       fi
     fi
@@ -587,7 +591,7 @@
     fi
   fi
   if test -z "${ENDORSED_JARS}"; then
-    AC_MSG_ERROR("A directory containing required jars (xalan-j2.jar, xalan-j2-serializer.jar, xerces-j2.jar) was not found.")
+    AC_MSG_ERROR("A directory containing required jars (xalan-j2.jar, xalan-j2-serializer.jar, xerces-j2.jar, xml-apis.jar) was not found.")
   fi
   AC_SUBST(ENDORSED_JARS)
 ])
@@ -725,6 +729,33 @@
   AC_SUBST(XERCES2_JAR)
 ])
 
+AC_DEFUN([IT_FIND_XML_APIS_JAR],
+[
+  AC_MSG_CHECKING([for a xerces2 xml-apis jar])
+  AC_ARG_WITH([xml-apis-jar],
+              [AS_HELP_STRING(--with-xml-apis-jar,specify location of the xerces2 xml-apis jar)],
+  [
+   if test -f "${withval}" ; then
+      XML_APIS_JAR="${withval}"
+    fi
+  ],
+  [
+    XML_APIS_JAR=
+  ])
+  if test -z "${XML_APIS_JAR}"; then
+    if test -e "/usr/share/java/xml-apis.jar"; then
+      XML_APIS_JAR=/usr/share/java/xml-apis.jar
+    else
+      AC_MSG_RESULT(no)
+    fi
+  fi
+  if test -z "${XML_APIS_JAR}"; then
+    AC_MSG_ERROR("A xerces2 xml-apis jar was not found.")
+  fi
+  AC_MSG_RESULT(${XML_APIS_JAR})
+  AC_SUBST(XML_APIS_JAR)
+])
+
 AC_DEFUN([IT_FIND_RHINO_JAR],
 [
   AC_MSG_CHECKING([whether to include Javascript support via Rhino])
diff -Naur icedtea6-1.10.4/configure.ac icedtea6-1.10.4-magellan/configure.ac
--- icedtea6-1.10.4/configure.ac	2011-10-13 19:39:16.561204799 +0200
+++ icedtea6-1.10.4-magellan/configure.ac	2012-01-05 17:20:23.648981560 +0100
@@ -159,6 +159,7 @@
   IT_FIND_XALAN2_JAR
   IT_FIND_XALAN2_SERIALIZER_JAR
   IT_FIND_XERCES2_JAR
+  IT_FIND_XML_APIS_JAR
 fi
 AC_CONFIG_FILES([javac], [chmod +x javac])
 AC_CONFIG_FILES([javap], [chmod +x javap])