diff --git a/.cvsignore b/.cvsignore
index ceee61e..2894a09 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ocaml-cairo-1.2.0.cvs20080301.tar.gz
+cairo-ocaml-1.0.0.tar.bz2
diff --git a/cairo-ocaml-1.0.0-bigarray.patch b/cairo-ocaml-1.0.0-bigarray.patch
new file mode 100644
index 0000000..c0afb8a
--- /dev/null
+++ b/cairo-ocaml-1.0.0-bigarray.patch
@@ -0,0 +1,12 @@
+diff -ur cairo-ocaml-1.0.0.orig/src/ml_cairo_bigarr.c cairo-ocaml-1.0.0.compat/src/ml_cairo_bigarr.c
+--- cairo-ocaml-1.0.0.orig/src/ml_cairo_bigarr.c	2009-06-18 19:01:26.000000000 +0100
++++ cairo-ocaml-1.0.0.compat/src/ml_cairo_bigarr.c	2009-10-08 12:46:54.795555155 +0100
+@@ -9,6 +9,8 @@
+ #include "ml_cairo.h"
+ 
+ #include <caml/bigarray.h>
++#undef CAML_NAME_SPACE
++#include <caml/compatibility.h>
+ 
+ unsigned long bigarray_byte_size (struct caml_bigarray *);
+ 
diff --git a/ocaml-cairo.spec b/ocaml-cairo.spec
index 6b2595e..ae6c022 100644
--- a/ocaml-cairo.spec
+++ b/ocaml-cairo.spec
@@ -1,28 +1,22 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
 
-# There are no source releases for ocaml-cairo.  To get the source
-# matching this you have to do:
-#
-# cvs -d:pserver:anonymous@cvs.cairographics.org:/cvs/cairo co -D 2008-03-01 cairo-ocaml
-# tar zcf /tmp/ocaml-cairo-1.2.0.cvs20080301.tar.gz --exclude CVS cairo-ocaml
-#
-# Whether you'll get precisely the same tarball by this method is
-# questionable.  If files get checked out in a different order then
-# you might need to use 'diff -urN' instead of comparing MD5 hashes.
-
 Name:           ocaml-cairo
-Version:        1.2.0.cvs20080301
-Release:        11%{?dist}
+Epoch:          1
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        OCaml library for accessing cairo graphics
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
+
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://cairographics.org/cairo-ocaml/
-Source0:        ocaml-cairo-%{version}.tar.gz
+
+Source0:        cairo-ocaml-%{version}.tar.bz2
 Source1:        ocaml-cairo-META
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    sparc64 s390 s390x
+Patch0:         cairo-ocaml-1.0.0-bigarray.patch
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -56,7 +50,7 @@ PDF 1.4.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 
 %description    devel
@@ -65,7 +59,9 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n cairo-ocaml
+%setup -q -n cairo-ocaml-%{version}
+%patch0 -p1
+
 aclocal -I support
 autoconf
 ./configure --libdir=%{_libdir}
@@ -119,6 +115,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  8 2009 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.0-1
+- New upstream version 1.0.0.
+- Yes, version number really did roll backwards, so now we're using Epoch.
+- Patch for compatibility with OCaml 3.11.1 (renamed bigarray structs).
+
 * Tue Sep 29 2009 Richard W.M. Jones <rjones@redhat.com> - 1.2.0.cvs20080301-11
 - Force rebuild against newer lablgtk.
 
diff --git a/sources b/sources
index 359d937..f26af7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4a91f25a2c18d5d26f2f19cf5b12980  ocaml-cairo-1.2.0.cvs20080301.tar.gz
+2b7e6f4dc7b78236eadaac16e16af0a9  cairo-ocaml-1.0.0.tar.bz2