diff --git a/.cvsignore b/.cvsignore
index 567b264..5f50bcc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libapreq2-2.06-dev.tar.gz
+libapreq2-2.07-rc2.tar.gz
diff --git a/libapreq2.spec b/libapreq2.spec
index 4113806..ed78ef3 100644
--- a/libapreq2.spec
+++ b/libapreq2.spec
@@ -1,14 +1,15 @@
 %{!?apxs: %{expand:%%define apxs %{_sbindir}/apxs}}
 
 Name:           libapreq2
-Version:        2.06
-Release:        2%{?dist}
+Version:        2.07
+Release:        0.rc2%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
 License:        Apache Software License
 URL:            http://httpd.apache.org/apreq/
-Source0:        http://www.cpan.org/authors/id/J/JO/JOESUF/%{name}-%{version}-dev.tar.gz
+#Source0:        http://www.cpan.org/authors/id/J/JO/JOESUF/%{name}-%{version}.tar.gz
+Source0:        http://people.apache.org/~joes/libapreq2-2.07-rc2.tar.gz
 Source1:        %{name}-httpd.conf
 Patch0:         %{name}-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +54,7 @@ library.
 
 
 %prep
-%setup -q -n %{name}-%{version}-dev
+%setup -q
 aprver=$(apr-config --version)
 apuver=$(apu-config --version)
 %{__perl} -pi -e \
@@ -66,6 +67,7 @@ apuver=$(apu-config --version)
   "s|<path>.*?</path>|<path>%{_docdir}/apr-util-devel-$apuver/html/</path>|" \
   docs/apu.tag
 %patch0
+rm glue/perl/pm_to_blib
 ./buildconf
 
 
@@ -75,7 +77,7 @@ apuver=$(apu-config --version)
   --disable-static \
   --with-apache2-apxs=%{apxs} \
   --enable-perl-glue \
-  --with-perl-opts=INSTALLDIRS=vendor
+  --with-mm-opts=INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 
@@ -134,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 15 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.07-0.rc2
+- 2.07-rc2.
+
 * Fri Aug  5 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.06-2
 - Include *.tag files in -devel docs, thanks to Bojan Smojver.
 - Remove *.la instead of using %%exclude.
diff --git a/sources b/sources
index 62b3057..a1b67f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e245db341c4967e0a23b7f767d6486d9  libapreq2-2.06-dev.tar.gz
+58126a3682617e65a5ce18ca542fd797  libapreq2-2.07-rc2.tar.gz