diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec
index ebe50fb..12ce6f3 100644
--- a/ocaml-calendar.spec
+++ b/ocaml-calendar.spec
@@ -1,9 +1,9 @@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global debug_package %{nil}
 
 Name:           ocaml-calendar
 Version:        2.01.1
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Objective Caml library for managing dates and times
 
 Group:          Development/Libraries
@@ -21,9 +21,9 @@ Patch0:         ocaml-calendar-2.01.1-META.patch
 
 # 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 -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
+%global __ocaml_requires_opts -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
+%global __ocaml_provides_opts -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.
@@ -86,6 +86,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan 12 2010 Richard W.M. Jones <rjones@redhat.com> - 2.01.1-5
+- Replace %%define with %%global.
+- Use upstream RPM 4.8 OCaml dependency generator.
+- Suppress bogus requires as well as provides.
+
 * Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 2.01.1-3
 - Rebuild for OCaml 3.11.2.