diff -ur misc/libxml2-2.9.4/include/libxml/xmlversion.h misc/build/libxml2-2.9.4/include/libxml/xmlversion.h
--- misc/libxml2-2.9.4/include/libxml/xmlversion.h	2015-11-20 01:49:39.000000000 -0800
+++ misc/build/libxml2-2.9.4/include/libxml/xmlversion.h	2016-03-26 09:46:21.124032000 -0700
@@ -273,7 +273,7 @@
  *
  * Whether iconv support is available
  */
-#if 1
+#if 0
 #define LIBXML_ICONV_ENABLED
 #endif
 
@@ -300,7 +300,7 @@
  *
  * Whether Debugging module is configured in
  */
-#if 1
+#if 0
 #define LIBXML_DEBUG_ENABLED
 #endif
 
diff -ur misc/libxml2-2.9.4/xml2-config.in misc/build/libxml2-2.9.4/xml2-config.in
--- misc/libxml2-2.9.4/xml2-config.in	2015-05-06 05:04:36.000000000 -0700
+++ misc/build/libxml2-2.9.4/xml2-config.in	2016-03-26 10:00:17.756184000 -0700
@@ -1,9 +1,14 @@
 #! /bin/sh
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
-libdir=@libdir@
+#prefix=@prefix@
+#exec_prefix=@exec_prefix@
+#includedir=@includedir@
+#libdir=@libdir@
+
+prefix=${SOLARVERSION}/${INPATH}
+exec_prefix=${SOLARVERSION}/${INPATH}
+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
 
 usage()
 {
@@ -67,7 +72,8 @@
 	;;
 
     --cflags)
-       	echo @XML_INCLUDEDIR@ @XML_CFLAGS@
+	echo -I${includedir}
+#       	echo @XML_INCLUDEDIR@ @XML_CFLAGS@
        	;;
 
     --libtool-libs)
@@ -82,19 +88,26 @@
        	;;
 
     --libs)
-        if [ "`uname`" = "Linux" ]
-	then
-	    if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
-	    then
-		echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
-	    else
-		echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
-	    fi
-	else
-	    echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@
-	fi
+	echo -L${libdir} ${LIBXML2LIB} -lm
+#        if [ "`uname`" = "Linux" ]
+#	then
+#	    if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
+#	    then
+#		echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
+#	    else
+#		echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
+#	    fi
+#	else
+#	    echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@
+#	fi
+
        	;;
 
+    print) # ugly configure hack
+	exit 0
+	;;
+
+
     *)
 	usage
 	exit 1