diff --git a/.cvsignore b/.cvsignore
index a4c0c2e..a30b46c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rakudo-2010.04.tar.gz
+rakudo-2010.05.tar.gz
diff --git a/rakudo.spec b/rakudo.spec
index 9d566b7..9eb6882 100644
--- a/rakudo.spec
+++ b/rakudo.spec
@@ -1,6 +1,6 @@
 %global year 2010
-%global month 04
-%global parrot_version 2.3.0
+%global month 05
+%global parrot_version 2.4.0
 
 %define parrot_dynext %{_libdir}/parrot/%{parrot_version}/dynext
 %define par_lang_perl6 %{_libdir}/parrot/%{parrot_version}/languages/perl6
@@ -40,6 +40,7 @@ exit 0
 
 %build
 %{__perl} Configure.pl
+sed -i -e 's&$(DESTDIR)$(DOCDIR)/rakudo&$(DESTDIR)$(DOCDIR)/rakudo-%{version}&' Makefile
 make
 
 
@@ -51,10 +52,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # Force executable permission on shared objects so they get stripped
 %{__chmod} 755 $RPM_BUILD_ROOT%{parrot_dynext}/perl6*.so
 
-# Creating man-page
-%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
-pod2man --section=1 --name=perl6 docs/running.pod | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/perl6.1.gz
-
 
 %check
 %{?!_without_tests: make test}
@@ -66,21 +63,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CREDITS LICENSE README
+%doc CREDITS LICENSE README docs/ChangeLog docs/ROADMAP
+%doc docs/S11-Modules-proposal.pod
 %{_bindir}/perl6
 %{parrot_dynext}/perl6_group.so
 %{parrot_dynext}/perl6_ops.so
-%{parrot_dynext}/perl6_ops_switch.so
 %{par_lang_perl6}/lib/Safe.pm
 %{par_lang_perl6}/lib/Test.pm
 %{par_lang_perl6}/lib/Test.pir
 %{par_lang_perl6}/perl6.pbc
 %{_mandir}/man1/perl6.1.gz
+%{_mandir}/man1/rakudo.1.gz
 
 
 %changelog
-* Thu Apr 22 2010 Gerd Pokorra <gp@zimt.uni-siegen.de> 0.0.2010.04_2.3.0-1
-- update to rakudo 2010.04 on parrot 2.3.0
+* Fri May 21 2010 Gerd Pokorra <gp@zimt.uni-siegen.de> 0.0.2010.05_2.4.0-1
+- update to rakudo 2010.05 on parrot 2.4.0
 
 * Thu Mar 18 2010 Gerd Pokorra <gp@zimt.uni-siegen.de> 0.0.2010.03_2.2.0-1
 - update to rakudo 2010.03 on parrot 2.2.0
@@ -89,9 +87,6 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Aug 9 2009 Gerd Pokorra <gp@zimt.uni-siegen.de> 0.0.2009.07_1.4.0-4
 - force executable permission on shared objects so they get stripped
 
-* Thu Aug 6 2009 Gerd Pokorra <gp@zimt.uni-siegen.de> 0.0.2009.07_1.4.0-2
-- add a perl6 man page
-
 * Fri Jul 31 2009 Gerd Pokorra <gp@zimt.uni-siegen.de> 0.0.2009.07_1.4.0-1
 - fix versioning
 - use 'ExcludeArch:ppc' for now
diff --git a/sources b/sources
index 9f74c59..6589710 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4546df9c407fb8757e857fab0a8482b7  rakudo-2010.04.tar.gz
+ae7c42c11151ea3d6142d9313da0e2cc  rakudo-2010.05.tar.gz