diff --git a/.cvsignore b/.cvsignore
index bbcc40d..3f33ad5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-calendar-1.10.tar.gz
+calendar-2.0.tar.gz
diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec
index 2bb19d8..bc7893f 100644
--- a/ocaml-calendar.spec
+++ b/ocaml-calendar.spec
@@ -2,24 +2,26 @@
 %define debug_package %{nil}
 
 Name:           ocaml-calendar
-Version:        1.10
-Release:        9%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Objective Caml library for managing dates and times
 
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://www.lri.fr/~signoles/prog.en.html#calendar
-Source0:        http://www.lri.fr/~signoles/prog/calendar/calendar-1.10.tar.gz
+Source0:        http://www.lri.fr/~signoles/prog/calendar/calendar-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  gawk
 
+# Ignore all generated modules *except* CalendarLib, since everything
+# now appears in that namespace.
 %define _use_internal_dependency_generator 0
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
+%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version
 
 %description
 Objective Caml library for managing dates and times.
@@ -62,24 +64,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc CHANGES README TODO LGPL COPYING
 %{_libdir}/ocaml/calendar
-%if %opt
-%exclude %{_libdir}/ocaml/calendar/*.a
-%exclude %{_libdir}/ocaml/calendar/*.cmxa
-%endif
 %exclude %{_libdir}/ocaml/calendar/*.mli
 
 
 %files devel
 %defattr(-,root,root,-)
 %doc CHANGES README TODO LGPL COPYING calendarFAQ-2.6.txt doc/*
-%if %opt
-%{_libdir}/ocaml/calendar/*.a
-%{_libdir}/ocaml/calendar/*.cmxa
-%endif
 %{_libdir}/ocaml/calendar/*.mli
 
 
 %changelog
+* Tue Feb 12 2008 Richard W.M. Jones <rjones@redhat.com> - 2.0-1
+- New upstream version 2.0.
+- Rebuild for OCaml 3.10.1.
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones@redhat.com> - 1.10-9
 - Force rebuild because of updated requires/provides scripts in OCaml.
 
diff --git a/sources b/sources
index e9f3b2d..e13f0e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab36c83c354644695cbf81165dc3757d  calendar-1.10.tar.gz
+3648311befb866a124a8cb00d667b269  calendar-2.0.tar.gz