diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index dcb5a0213ed..bc2bf572e83 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.112 2008/04/01 11:36:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.113 2008/05/06 18:53:01 steven Exp $
 
 COMMENT-main=		XML parsing library
 COMMENT-python=		Python bindings for libxml
 
-VERSION=		2.6.30
+VERSION=		2.6.32
 DISTNAME=		libxml2-${VERSION}
-PKGNAME-main=		libxml-${VERSION}p0
-PKGNAME-python=		py-libxml-${VERSION}p1
-SHARED_LIBS=		xml2	9.7
+PKGNAME-main=		libxml-${VERSION}
+PKGNAME-python=		py-libxml-${VERSION}
+SHARED_LIBS=		xml2	9.8
 CATEGORIES=		textproc
 MASTER_SITES=		ftp://xmlsoft.org/libxml/ \
 			${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
diff --git a/textproc/libxml/distinfo b/textproc/libxml/distinfo
index f99c189dce7..d6aa2948737 100644
--- a/textproc/libxml/distinfo
+++ b/textproc/libxml/distinfo
@@ -1,5 +1,5 @@
-MD5 (libxml2-2.6.30.tar.gz) = Rg5thT6CTacA1phTLlcxaw==
-RMD160 (libxml2-2.6.30.tar.gz) = itzKKmC06Q3omNlxCjpFBptzu/4=
-SHA1 (libxml2-2.6.30.tar.gz) = UZcB3zoQdwmA6ZMzb+Ge99lbW7o=
-SHA256 (libxml2-2.6.30.tar.gz) = h3dioPRHhUh9dH7XvT2zZK3nWUPm2OnEn6Y0DDgzc14=
-SIZE (libxml2-2.6.30.tar.gz) = 4726657
+MD5 (libxml2-2.6.32.tar.gz) = JiHTIsFvAlfjDw/ysTOE3g==
+RMD160 (libxml2-2.6.32.tar.gz) = 7bnJqBPssS6yFNH3XZJ6yzgUgxw=
+SHA1 (libxml2-2.6.32.tar.gz) = HEZcDvnSG7Sn3wLU7frX3+HiY98=
+SHA256 (libxml2-2.6.32.tar.gz) = G0QouHmvyq48IBOyEoO6rQQGYfvVAuiT6DrcPRXIXVM=
+SIZE (libxml2-2.6.32.tar.gz) = 4722227
diff --git a/textproc/libxml/patches/patch-Makefile.in b/textproc/libxml/patches/patch-Makefile.in
index 983156faf78..53d21255c5f 100644
--- a/textproc/libxml/patches/patch-Makefile.in
+++ b/textproc/libxml/patches/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue Jun 12 18:20:23 2007
-+++ Makefile.in	Mon Jul  2 12:50:32 2007
-@@ -525,7 +525,7 @@ testModule_DEPENDENCIES = $(DEPS)
+--- Makefile.in.orig	Tue Apr  8 16:55:03 2008
++++ Makefile.in	Sat Apr 26 10:51:02 2008
+@@ -584,7 +584,7 @@ testModule_DEPENDENCIES = $(DEPS)
  testModule_LDADD = $(LDADDS)
  noinst_LTLIBRARIES = testdso.la
  testdso_la_SOURCES = testdso.c
@@ -9,7 +9,7 @@
  testapi_SOURCES = testapi.c
  testapi_LDFLAGS = 
  testapi_DEPENDENCIES = $(DEPS)
-@@ -554,7 +554,7 @@ pkgconfig_DATA = libxml-2.0.pc
+@@ -613,7 +613,7 @@ pkgconfig_DATA = libxml-2.0.pc
  # Install the tests program sources as examples 
  #
  BASE_DIR = $(datadir)/doc
@@ -18,7 +18,7 @@
  EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -1922,6 +1922,7 @@ SVGtests : xmllint$(EXEEXT)
+@@ -1990,6 +1990,7 @@ SVGtests : xmllint$(EXEEXT)
  	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
  	  else \
  	      echo Testing $$name ; \
diff --git a/textproc/libxml/patches/patch-configure b/textproc/libxml/patches/patch-configure
index 0dd51011257..a05c65f2b32 100644
--- a/textproc/libxml/patches/patch-configure
+++ b/textproc/libxml/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.17 2007/07/05 16:05:09 steven Exp $
---- configure.orig	Tue Jun 12 18:10:36 2007
-+++ configure	Mon Jul  2 12:50:32 2007
-@@ -27029,7 +27029,7 @@ fi
+$OpenBSD: patch-configure,v 1.18 2008/05/06 18:53:01 steven Exp $
+--- configure.orig	Tue Apr  8 16:48:27 2008
++++ configure	Sat Apr 26 10:51:02 2008
+@@ -27302,7 +27302,7 @@ fi
      fi
      if test "$with_python" != ""
      then
diff --git a/textproc/libxml/patches/patch-doc_Makefile_in b/textproc/libxml/patches/patch-doc_Makefile_in
index d59ebc9268b..1943b1744b5 100644
--- a/textproc/libxml/patches/patch-doc_Makefile_in
+++ b/textproc/libxml/patches/patch-doc_Makefile_in
@@ -1,10 +1,10 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.15 2007/07/05 16:05:09 steven Exp $
---- doc/Makefile.in.orig	Tue Jun 12 18:20:21 2007
-+++ doc/Makefile.in	Mon Jul  2 12:50:32 2007
-@@ -274,7 +274,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+$OpenBSD: patch-doc_Makefile_in,v 1.16 2008/05/06 18:53:01 steven Exp $
+--- doc/Makefile.in.orig	Tue Apr  8 16:55:01 2008
++++ doc/Makefile.in	Sat Apr 26 10:51:46 2008
+@@ -275,7 +275,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -SUBDIRS = devhelp examples
 +SUBDIRS = examples
  
diff --git a/textproc/libxml/patches/patch-parserInternals_c b/textproc/libxml/patches/patch-parserInternals_c
deleted file mode 100644
index 6abec8066b8..00000000000
--- a/textproc/libxml/patches/patch-parserInternals_c
+++ /dev/null
@@ -1,58 +0,0 @@
-$OpenBSD: patch-parserInternals_c,v 1.1 2008/04/01 11:34:16 jasper Exp $
---- parserInternals.c.orig	Tue Jun 12 15:33:54 2007
-+++ parserInternals.c	Tue Apr  1 10:36:06 2008
-@@ -638,14 +638,13 @@ xmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
- 
- 	c = *cur;
- 	if (c & 0x80) {
--	    if (c == 0xC0)
-+	    if (((c & 0x40) == 0) || (c == 0xC0))
- 		goto encoding_error;
- 	    if (cur[1] == 0)
- 		xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
- 	    if ((cur[1] & 0xc0) != 0x80)
- 		goto encoding_error;
- 	    if ((c & 0xe0) == 0xe0) {
--
- 		if (cur[2] == 0)
- 		    xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
- 		if ((cur[2] & 0xc0) != 0x80)
-@@ -662,18 +661,24 @@ xmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
- 		    val |= (cur[1] & 0x3f) << 12;
- 		    val |= (cur[2] & 0x3f) << 6;
- 		    val |= cur[3] & 0x3f;
-+		    if (val < 0x10000)
-+			goto encoding_error;
- 		} else {
- 		  /* 3-byte code */
- 		    *len = 3;
- 		    val = (cur[0] & 0xf) << 12;
- 		    val |= (cur[1] & 0x3f) << 6;
- 		    val |= cur[2] & 0x3f;
-+		    if (val < 0x800)
-+			goto encoding_error;
- 		}
- 	    } else {
- 	      /* 2-byte code */
- 		*len = 2;
- 		val = (cur[0] & 0x1f) << 6;
- 		val |= cur[1] & 0x3f;
-+		if (val < 0x80)
-+		    goto encoding_error;
- 	    }
- 	    if (!IS_CHAR(val)) {
- 	        xmlErrEncodingInt(ctxt, XML_ERR_INVALID_CHAR,
-@@ -683,6 +688,13 @@ xmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
- 	} else {
- 	    /* 1-byte code */
- 	    *len = 1;
-+	    if (*ctxt->input->cur == 0)
-+		xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
-+	    if ((*ctxt->input->cur == 0) &&
-+	        (ctxt->input->end > ctxt->input->cur)) {
-+	        xmlErrEncodingInt(ctxt, XML_ERR_INVALID_CHAR,
-+				  "Char 0x%X out of allowed range\n", val);
-+	    }
- 	    if (*ctxt->input->cur == 0xD) {
- 		if (ctxt->input->cur[1] == 0xA) {
- 		    ctxt->nbChars++;
diff --git a/textproc/libxml/patches/patch-python_Makefile_in b/textproc/libxml/patches/patch-python_Makefile_in
index 66f0946a850..4ab5277904e 100644
--- a/textproc/libxml/patches/patch-python_Makefile_in
+++ b/textproc/libxml/patches/patch-python_Makefile_in
@@ -1,13 +1,12 @@
-$OpenBSD: patch-python_Makefile_in,v 1.8 2007/07/05 16:05:09 steven Exp $
---- python/Makefile.in.orig	Tue Jun 12 18:20:22 2007
-+++ python/Makefile.in	Mon Jul  2 12:50:32 2007
-@@ -735,9 +735,6 @@ uninstall-info: uninstall-info-recursive
- @WITH_PYTHON_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pythondir)
- @WITH_PYTHON_TRUE@	@INSTALL@ -m 0644 libxml2.py $(DESTDIR)$(pythondir)
- @WITH_PYTHON_TRUE@	@INSTALL@ -m 0644 $(srcdir)/drv_libxml2.py $(DESTDIR)$(pythondir)
--@WITH_PYTHON_TRUE@	$(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
--@WITH_PYTHON_TRUE@	@(for doc in $(DOCS) ; \
--@WITH_PYTHON_TRUE@	   do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
+$OpenBSD: patch-python_Makefile_in,v 1.9 2008/05/06 18:53:01 steven Exp $
+--- python/Makefile.in.orig	Tue Apr  8 16:55:02 2008
++++ python/Makefile.in	Sat Apr 26 11:53:47 2008
+@@ -737,7 +737,7 @@ info: info-recursive
  
- @WITH_PYTHON_TRUE@$(GENERATED): gen_prog
+ info-am:
  
+-install-data-am: install-dist_docsDATA install-dist_pythonDATA \
++install-data-am: install-dist_pythonDATA \
+ 	install-pythonDATA install-pythonLTLIBRARIES
+ 
+ install-dvi: install-dvi-recursive
diff --git a/textproc/libxml/patches/patch-python_tests_Makefile_in b/textproc/libxml/patches/patch-python_tests_Makefile_in
index 0186d6a0fc5..07aeee575fc 100644
--- a/textproc/libxml/patches/patch-python_tests_Makefile_in
+++ b/textproc/libxml/patches/patch-python_tests_Makefile_in
@@ -1,7 +1,16 @@
-$OpenBSD: patch-python_tests_Makefile_in,v 1.7 2007/07/05 16:05:09 steven Exp $
---- python/tests/Makefile.in.orig	Tue Jun 12 18:20:23 2007
-+++ python/tests/Makefile.in	Mon Jul  2 12:50:32 2007
-@@ -297,7 +297,6 @@ PYTESTS = \
+$OpenBSD: patch-python_tests_Makefile_in,v 1.8 2008/05/06 18:53:01 steven Exp $
+--- python/tests/Makefile.in.orig	Tue Apr  8 16:55:02 2008
++++ python/tests/Makefile.in	Sat Apr 26 11:59:41 2008
+@@ -270,7 +270,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
++exampledir = $(datadir)/examples/libxml2
+ dist_example_DATA = $(PYTESTS) $(XMLS)
+ PYTESTS = \
+     build.py	\
+@@ -307,7 +307,6 @@ PYTESTS = \
      readererr.py\
      relaxng.py	\
      schema.py	\
diff --git a/textproc/libxml/patches/patch-xstc_Makefile_in b/textproc/libxml/patches/patch-xstc_Makefile_in
index 139ba15e817..83186263a83 100644
--- a/textproc/libxml/patches/patch-xstc_Makefile_in
+++ b/textproc/libxml/patches/patch-xstc_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-xstc_Makefile_in,v 1.1 2007/07/05 16:05:09 steven Exp $
---- xstc/Makefile.in.orig	Mon Jul  2 13:45:51 2007
-+++ xstc/Makefile.in	Mon Jul  2 13:46:06 2007
-@@ -461,7 +461,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta
+$OpenBSD: patch-xstc_Makefile_in,v 1.2 2008/05/06 18:53:01 steven Exp $
+--- xstc/Makefile.in.orig	Tue Apr  8 16:55:02 2008
++++ xstc/Makefile.in	Sat Apr 26 10:51:02 2008
+@@ -471,7 +471,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta
  	   else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi ; fi)
  	-@(if [ -f $(TARBALL_2) ] ; then \
  	   echo -n "extracting test data (NIST)..." ; \
@@ -10,7 +10,7 @@ $OpenBSD: patch-xstc_Makefile_in,v 1.1 2007/07/05 16:05:09 steven Exp $
  	   echo "done" ; \
  	   fi)
  	-@(if [ ! -f $(TARBALL) ] ; then \
-@@ -473,7 +473,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta
+@@ -483,7 +483,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta
  	   else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi ; fi)
  	-@(if [ -f $(TARBALL) ] ; then \
  	   echo -n "extracting test data (Sun, Microsoft)..." ; \
diff --git a/textproc/libxml/pkg/PFRAG.shared-python b/textproc/libxml/pkg/PFRAG.shared-python
index 33282f244dd..0d3c7fcbbb7 100644
--- a/textproc/libxml/pkg/PFRAG.shared-python
+++ b/textproc/libxml/pkg/PFRAG.shared-python
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared-python,v 1.2 2007/04/23 15:34:04 steven Exp $
+@comment $OpenBSD: PFRAG.shared-python,v 1.3 2008/05/06 18:53:01 steven Exp $
 lib/python${MODPY_VERSION}/
 lib/python${MODPY_VERSION}/site-packages/
 lib/python${MODPY_VERSION}/site-packages/drv_libxml2.py
@@ -55,4 +55,5 @@ share/examples/libxml2/validate.py
 share/examples/libxml2/walker.py
 share/examples/libxml2/xpath.py
 share/examples/libxml2/xpathext.py
+share/examples/libxml2/xpathns.py
 share/examples/libxml2/xpathret.py