diff --git a/.cvsignore b/.cvsignore
index 38eefc1..1c8a15d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 XML-LibXML-1.56.tar.gz
+XML-LibXML-1.58.tar.gz
diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec
index 9916850..26b6ba9 100644
--- a/perl-XML-LibXML.spec
+++ b/perl-XML-LibXML.spec
@@ -1,7 +1,9 @@
+%{!?perl_vendorarch: %define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)}
+
 Summary: XML-LibXML Perl module
 Name: perl-XML-LibXML
-Version: 1.56
-Release: 11
+Version: 1.58
+Release: 1
 License: GPL or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/XML-LibXML/
@@ -10,10 +12,10 @@ BuildRequires: perl >= 2:5.8.0
 Requires: %(perl -MConfig -le 'if (defined $Config{useithreads}) { print "perl(:WITH_ITHREADS)" } else { print "perl(:WITHOUT_ITHREADS)" }')
 Requires: %(perl -MConfig -le 'if (defined $Config{usethreads}) { print "perl(:WITH_THREADS)" } else { print "perl(:WITHOUT_THREADS)" }')
 Requires: %(perl -MConfig -le 'if (defined $Config{uselargefiles}) { print "perl(:WITH_LARGEFILES)" } else { print "perl(:WITHOUT_LARGEFILES)" }')
-Source0: XML-LibXML-1.56.tar.gz
-Patch0: perl-XML-LibXML-1.53-nosaxinst.patch
-Patch1: perl-XML-LibXML-1.56-noextern.patch
+Requires: perl(:MODULE_COMPAT_%(perl -MConfig -e 'print $Config{version}'))
+Source0: XML-LibXML-1.58.tar.gz
 BuildRequires: perl-XML-LibXML-Common perl-XML-SAX perl-XML-NamespaceSupport
+BuildRequires: libxml2-devel
 Requires: perl-XML-LibXML-Common perl-XML-SAX perl-XML-NamespaceSupport
 
 %description
@@ -21,41 +23,55 @@ Requires: perl-XML-LibXML-Common perl-XML-SAX perl-XML-NamespaceSupport
 
 %prep
 %setup -q -n XML-LibXML-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix} INSTALLDIRS=vendor < /dev/null
+CFLAGS="$RPM_OPT_FLAGS" SKIP_SAX_INSTALL=1 perl Makefile.PL INSTALLDIRS=vendor
 make OPTIMIZE="$RPM_OPT_FLAGS"
-make test || :
 
 %install
 rm -rf $RPM_BUILD_ROOT
-eval `perl '-V:installarchlib'`
-mkdir -p $RPM_BUILD_ROOT$installarchlib
-%makeinstall
-rm -f `find $RPM_BUILD_ROOT -type f -name perllocal.pod -o -name .packlist`
+make install \
+  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
+  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
+find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
+  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+chmod -R u+w $RPM_BUILD_ROOT/*
 
-[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
-
-find $RPM_BUILD_ROOT%{_prefix} -type f -print | \
-	sed "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-%{release}-filelist
-if [ "$(cat %{name}-%{version}-%{release}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit 1
-fi
+%check || :
+make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}-%{version}-%{release}-filelist
+%triggerin -- perl-XML-SAX
+for p in XML::LibXML::SAX::Parser XML::LibXML::SAX ; do
+  perl -MXML::SAX -e "XML::SAX->add_parser(q($p))->save_parsers()" || :
+done
+
+%preun
+if [ $1 -eq 0 ] ; then
+  for p in XML::LibXML::SAX::Parser XML::LibXML::SAX ; do
+    perl -MXML::SAX -e "XML::SAX->remove_parser(q($p))->save_parsers()" \
+      2>/dev/null || :
+  done
+fi
+
+%files
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
+%{perl_vendorarch}/auto/XML
+%{perl_vendorarch}/XML
+%{_mandir}/man3/*.3*
 
 %changelog
-* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
+* Sun Apr 18 2004 Ville Skyttä <ville.skytta at iki.fi> - 1.58-1
+- #121168
+- Update to 1.58.
+- Require perl(:MODULE_COMPAT_*).
+- Handle ParserDetails.ini parser registration.
+- BuildRequires libxml2-devel.
+- Own installed directories.
 
 * Fri Feb 27 2004 Chip Turner <cturner@redhat.com> - 1.56-1
 - Specfile autogenerated.
-
diff --git a/sources b/sources
index 445da60..e3eb926 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e22a4d79e6afdc8965518bf8a3abb492  XML-LibXML-1.56.tar.gz
+4691fc436e5c0f22787f5b4a54fc56b0  XML-LibXML-1.58.tar.gz