diff --git a/.cvsignore b/.cvsignore
index 197b159..2e13a1b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-YAML-0.35.tar.gz
+YAML-0.39.tar.gz
diff --git a/perl-YAML-testmore054.patch b/perl-YAML-testmore054.patch
new file mode 100644
index 0000000..67afbad
--- /dev/null
+++ b/perl-YAML-testmore054.patch
@@ -0,0 +1,15 @@
+--- t/20load.t~	2005-03-31 05:18:43.000000000 +0300
++++ t/20load.t	2005-04-13 17:35:47.000000000 +0300
+@@ -1,7 +1,11 @@
+ use lib 'lib', 't';
+ use TestChunks;
+ plan tests => number_of_tests;
+-test_load;
++SKIP: {
++  Test::More::skip "This test hangs with Test::More < 0.54", number_of_tests
++    unless $Test::More::VERSION && $Test::More::VERSION >= 0.54;
++  test_load;
++};
+ 
+ __DATA__
+ ===
diff --git a/perl-YAML.spec b/perl-YAML.spec
index 184ab15..4c638f6 100644
--- a/perl-YAML.spec
+++ b/perl-YAML.spec
@@ -1,15 +1,13 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-YAML
-Version:        0.35
-Release:        6
-
+Version:        0.39
+Release:        2
 Summary:        YAML Ain't Markup Language (tm)
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/YAML/
-Source0:        http://www.cpan.org/authors/id/I/IN/INGY/YAML-0.35.tar.gz
+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
@@ -28,11 +26,11 @@ specification.
 
 %prep
 %setup -q -n YAML-%{version}
-chmod 644 Changes README
+%patch0 -p0
 
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
+%{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 
@@ -55,12 +53,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{_bindir}/*
+%{_bindir}/ysh
 %{perl_vendorlib}/YAML*
-%{_mandir}/man?/*
+%{_mandir}/man1/ysh.1*
+%{_mandir}/man3/YAML*.3*
 
 
 %changelog
+* Thu Apr 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.39-2
+- 0.39.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
diff --git a/sources b/sources
index a488bcc..d6b8b8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03f1c4446fae2bcc7d606b0b3ded0632  YAML-0.35.tar.gz
+b8a49f49cb0ee6d9698807fb3f606922  YAML-0.39.tar.gz