diff --git a/perl-YAML.spec b/perl-YAML.spec
index 61002ee..5ae9378 100644
--- a/perl-YAML.spec
+++ b/perl-YAML.spec
@@ -1,18 +1,15 @@
 Name:           perl-YAML
-Version:        0.39
+Version:        0.58
 Release:        2%{?dist}
 Summary:        YAML Ain't Markup Language (tm)
-
-Group:          Development/Libraries
 License:        GPL or Artistic
+Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/YAML/
 Source0:        http://www.cpan.org/authors/id/I/IN/INGY/YAML-%{version}.tar.gz
-Patch0:         %{name}-testmore054.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(Test::Base) >= 0.49
+Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 The YAML.pm module implements a YAML Loader and Dumper based on the
@@ -23,43 +20,48 @@ most modern programming languages, including Perl.
 For information on the YAML syntax, please refer to the YAML
 specification.
 
-
 %prep
 %setup -q -n YAML-%{version}
-%patch0 -p0
-
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
 
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
 
-%check || :
-make test
+chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
 
+%check
+make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %doc Changes README
 %{_bindir}/ysh
 %{perl_vendorlib}/YAML*
+%{perl_vendorlib}/Test/YAML*
 %{_mandir}/man1/ysh.1*
 %{_mandir}/man3/YAML*.3*
-
+%{_mandir}/man3/Test::YAML*.3*
 
 %changelog
+* Tue May 09 2006 Steven Pritchard <steve@kspei.com> 0.58-2
+- Drop testmore patch.
+- Catch Test::YAML module and man page in file list.
+
+* Thu May 04 2006 Steven Pritchard <steve@kspei.com> 0.58-1
+- Update to 0.58.
+- Small spec cleanups.
+
 * Thu Apr 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.39-2
 - 0.39.
 
diff --git a/sources b/sources
index d6b8b8d..e1a847f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8a49f49cb0ee6d9698807fb3f606922  YAML-0.39.tar.gz
+aa5ac653057914ca995dd74de8212ebc  YAML-0.58.tar.gz