diff --git a/.gitignore b/.gitignore
index 8075d72..6013208 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 camomile-0.7.2.tar.bz2
+/camomile-0.8.1.tar.bz2
diff --git a/ocaml-camomile.spec b/ocaml-camomile.spec
index 5f6faf6..c9bbde3 100644
--- a/ocaml-camomile.spec
+++ b/ocaml-camomile.spec
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-camomile
-Version:        0.7.2
-Release:        2%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        Unicode library for OCaml
 
 Group:          Development/Libraries
@@ -12,7 +12,7 @@ Group:          Development/Libraries
 # https://www.redhat.com/archives/fedora-legal-list/2008-March/msg00005.html
 License:        LGPLv2+
 URL:            http://sourceforge.net/projects/camomile/
-Source0:        http://downloads.sourceforge.net/camomile/camomile-0.7.2.tar.bz2
+Source0:        http://downloads.sourceforge.net/camomile/camomile-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64 sparc64 s390 s390x
 
@@ -71,8 +71,8 @@ mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 make install prefix=$RPM_BUILD_ROOT%{_prefix} DATADIR=$RPM_BUILD_ROOT%{_datadir}
 %if %opt
-mv $RPM_BUILD_ROOT%{_bindir}/camomilecharmap.opt $RPM_BUILD_ROOT%{_bindir}/camomilecharmap
-mv $RPM_BUILD_ROOT%{_bindir}/camomilelocaledef.opt $RPM_BUILD_ROOT%{_bindir}/camomilelocaledef
+cp tools/camomilecharmap.opt $RPM_BUILD_ROOT%{_bindir}/camomilecharmap
+cp tools/camomilelocaledef.opt $RPM_BUILD_ROOT%{_bindir}/camomilelocaledef
 %endif
 
 
@@ -114,6 +114,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan  5 2011 Richard W.M. Jones <rjones@redhat.com> - 0.8.1-1
+- New upstream version 0.8.1.
+- Rebuild for OCaml 3.12.0.
+- camomilecharmap and camomilelocaledef no longer installed by default,
+  install them by hand instead.
+
 * Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 0.7.2-2
 - Rebuild for OCaml 3.11.2.
 
diff --git a/sources b/sources
index 533852a..bec8dea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-288e17838fedc52aacb733952b25d5dd  camomile-0.7.2.tar.bz2
+999fc48a71030a1e765b85e3c1e7b933  camomile-0.8.1.tar.bz2