diff --git a/.cvsignore b/.cvsignore
index 4ce56f6..6799138 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ocaml-libvirt-0.3.2.4.tar.gz
+ocaml-libvirt-0.3.2.5.tar.gz
diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec
index 89f9879..969d810 100644
--- a/ocaml-libvirt.spec
+++ b/ocaml-libvirt.spec
@@ -8,7 +8,7 @@
 %define build_full_featured_virt_top 1
 
 Name:           ocaml-libvirt
-Version:        0.3.2.4
+Version:        0.3.2.5
 Release:        1%{?dist}
 Summary:        OCaml binding for libvirt
 
@@ -38,6 +38,7 @@ BuildRequires:  ocaml-csv-devel
 %endif
 BuildRequires:  libvirt-devel >= 0.2.1
 BuildRequires:  perl
+BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
@@ -154,7 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING.LIB README TODO
+%doc COPYING.LIB README
 %{_libdir}/ocaml/libvirt
 %if %opt
 %exclude %{_libdir}/ocaml/libvirt/*.a
@@ -168,7 +169,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING.LIB README TODO html/*
+%doc COPYING.LIB README TODO.libvirt html/*
 %if %opt
 %{_libdir}/ocaml/libvirt/*.a
 %{_libdir}/ocaml/libvirt/*.cmxa
@@ -196,13 +197,19 @@ rm -rf $RPM_BUILD_ROOT
 %if %build_virt_top
 %files -n virt-top
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING README TODO.virt-top
 %{_bindir}/virt-top
 %{_mandir}/man1/*.1.gz
 %endif
 
 
 %changelog
+* Wed Aug 29 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.5-1
+- New upstream version 0.3.2.5.
+- Keep TODO out of the main package, but add (renamed) TODO.libvirt and
+  TODO.virt-top to the devel and virt-top packages respectively.
+- Add BR gawk.
+
 * Thu Aug 23 2007 Richard W.M. Jones <rjones@redhat.com> - 0.3.2.4-1
 - New upstream version 0.3.2.4.
 
diff --git a/sources b/sources
index ddbe707..6a662a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0b2db9c329791831753671a1af5c612  ocaml-libvirt-0.3.2.4.tar.gz
+1ee9bac2181ee3123ebe018ead0a1933  ocaml-libvirt-0.3.2.5.tar.gz