diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile
index 1e1d3a49421..f37696f6a2e 100644
--- a/textproc/p5-XML-Sablotron/Makefile
+++ b/textproc/p5-XML-Sablotron/Makefile
@@ -1,30 +1,34 @@
-# $OpenBSD: Makefile,v 1.19 2007/09/15 20:59:41 merdely Exp $
+# $OpenBSD: Makefile,v 1.20 2009/05/23 15:00:03 benoit Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 COMMENT=	perl interface to the Sablotron XSLT engine
 
-DISTNAME=	XML-Sablotron-1.0
-PKGNAME=	p5-${DISTNAME}p1
+DISTNAME=	XML-Sablotron-1.01
+PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	textproc perl5
-MASTER_SITES=	http://download-1.gingerall.cz/download/sablot/
 
-HOMEPAGE=	http://www.gingerall.cz/
-MAINTAINER=	Anil Madhavapeddy <avsm@openbsd.org>
+HOMEPAGE=	http://www.gingerall.org/
 
-MODULES=	converters/libiconv
-USE_X11=	Yes
-LIB_DEPENDS=	sablot.>=100::textproc/sablotron
+MAINTAINER=	Benoit Lecocq <benoit@openbsd.org>
 
-# GPL/Mozilla
+# GPLv2 / MPL1.1
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		expat m
+
+WANTLIB=	expat m
+
+MASTER_SITES=	http://download-1.gingerall.cz/download/sablot/
+
+MODULES=	converters/libiconv
+LIB_DEPENDS=	sablot.>=100::textproc/sablotron
+
+USE_X11=	Yes
 
 CONFIGURE_STYLE= perl
-CONFIGURE_ARGS=  EXPATLIBPATH="${X11BASE}/lib" EXPATINCPATH="${X11BASE}/include" SABLOTLIBPATH="${LOCALBASE}/lib" SABLOTINCPATH="${LOCALBASE}/include"
+CONFIGURE_ARGS=	 EXPATLIBPATH="${X11BASE}/lib" EXPATINCPATH="${X11BASE}/include" SABLOTLIBPATH="${LOCALBASE}/lib" SABLOTINCPATH="${LOCALBASE}/include"
 
 .include <bsd.own.mk>
 USE_GCC3?= No
diff --git a/textproc/p5-XML-Sablotron/distinfo b/textproc/p5-XML-Sablotron/distinfo
index df3a62fc79f..03c5adb3dcf 100644
--- a/textproc/p5-XML-Sablotron/distinfo
+++ b/textproc/p5-XML-Sablotron/distinfo
@@ -1,5 +1,5 @@
-MD5 (XML-Sablotron-1.0.tar.gz) = +YJcf5oiQ4Qd5lu6kxD6WA==
-RMD160 (XML-Sablotron-1.0.tar.gz) = u0aX4oKCmqGv1ZyHAmEpXz5TxLE=
-SHA1 (XML-Sablotron-1.0.tar.gz) = YUn8YSdWaVK8I+M0J4nVqLZI0fU=
-SHA256 (XML-Sablotron-1.0.tar.gz) = KycoHPSn+I4qhpiSy6JP43dhRAdXPwr89mMlA1gIS5o=
-SIZE (XML-Sablotron-1.0.tar.gz) = 52711
+MD5 (XML-Sablotron-1.01.tar.gz) = 2dIbIL/4sEyWa5w7Z4mJwQ==
+RMD160 (XML-Sablotron-1.01.tar.gz) = 5KSpylIO2QluoPztL+TUPyJ+CVM=
+SHA1 (XML-Sablotron-1.01.tar.gz) = CntoiyAwD5WZPgwfVnYesNUEdyo=
+SHA256 (XML-Sablotron-1.01.tar.gz) = jTWTelJCXDiiIo2BtBhHeSn92fbwj+A42oTrnw6fRNI=
+SIZE (XML-Sablotron-1.01.tar.gz) = 53023
diff --git a/textproc/p5-XML-Sablotron/patches/patch-Makefile_PL b/textproc/p5-XML-Sablotron/patches/patch-Makefile_PL
index 73677086b7a..8da6be99491 100644
--- a/textproc/p5-XML-Sablotron/patches/patch-Makefile_PL
+++ b/textproc/p5-XML-Sablotron/patches/patch-Makefile_PL
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Makefile_PL,v 1.2 2004/02/29 01:03:32 avsm Exp $
---- Makefile.PL.orig	2003-02-21 14:17:32.000000000 +0000
-+++ Makefile.PL	2004-02-29 00:45:03.000000000 +0000
-@@ -185,7 +185,7 @@ unless ($js_libpath) {
-     }
+$OpenBSD: patch-Makefile_PL,v 1.3 2009/05/23 15:00:07 benoit Exp $
+--- Makefile.PL.orig	Wed Oct 15 14:18:01 2003
++++ Makefile.PL	Sat May 23 08:57:59 2009
+@@ -203,7 +203,7 @@
+  }
  }
  
 -our $libs = ' ';
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_PL,v 1.2 2004/02/29 01:03:32 avsm Exp $
  
  if ($js_found || $js_libpath) {
      $libs = "-l$js_libname $libs" if $js_libname;
-@@ -193,7 +193,7 @@ if ($js_found || $js_libpath) {
+@@ -211,7 +211,7 @@
  }
  
  #sablot and expat libraries