diff --git a/.cvsignore b/.cvsignore
index 055485f..87fc490 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-calendar-2.0.2.tar.gz
+calendar-2.0.4.tar.gz
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..a5becfe
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+ocaml-calendar-2_0_4-1_fc10:HEAD:ocaml-calendar-2.0.4-1.fc10.src.rpm:1215680482
diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec
index 21e8323..1041cb8 100644
--- a/ocaml-calendar.spec
+++ b/ocaml-calendar.spec
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-calendar
-Version:        2.0.2
-Release:        2%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 Summary:        Objective Caml library for managing dates and times
 
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ developing applications that use %{name}.
 make
 make doc
 
+mv TODO TODO.old
+iconv -f iso-8859-1 -t utf-8 < TODO.old > TODO
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -63,16 +66,27 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc CHANGES README TODO LGPL COPYING
 %{_libdir}/ocaml/calendar
+%if %opt
+%exclude %{_libdir}/ocaml/calendar/*.cmx
+%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/*.cmx
+%endif
 %{_libdir}/ocaml/calendar/*.mli
 
 
 %changelog
+* Thu Jul 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.0.4-1
+- New upstream version 2.0.4 (rhbz #454789).
+- Fix non-UTF-8 characters in TODO.
+- *.cmx file moved to -devel subpackage as per packaging guidelines.
+
 * Wed Apr 23 2008 Richard W.M. Jones <rjones@redhat.com> - 2.0.2-2
 - Rebuild for OCaml 3.10.2
 
diff --git a/sources b/sources
index f07fc53..6336afd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1631f5f21bf4d9b57a2fb7d956e44bdb  calendar-2.0.2.tar.gz
+f460b1f0544d6c29b9d6517ef8a4b282  calendar-2.0.4.tar.gz