diff --git a/.cvsignore b/.cvsignore
index 5283baa..e39aab8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ocaml-gettext-0.3.2.tar.gz
+ocaml-gettext-0.3.3.tar.gz
diff --git a/ocaml-gettext-0.3.2-dynlink.patch b/ocaml-gettext-0.3.2-dynlink.patch
deleted file mode 100644
index cc888a1..0000000
--- a/ocaml-gettext-0.3.2-dynlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ocaml-gettext-0.3.2.orig/ocaml-gettext/Makefile	2008-04-29 21:12:45.000000000 +0100
-+++ ocaml-gettext-0.3.2/ocaml-gettext/Makefile	2008-12-05 12:22:12.000000000 +0000
-@@ -63,7 +63,7 @@
- 
- ocaml-xgettext: $(BUILDBIN)
- 	$(OCAMLC)                                                            \
--           -I +camlp4 camlp4lib.cma                                          \
-+           -I +camlp4 dynlink.cma camlp4lib.cma                              \
-            unix.cma                                                          \
-           `$(OCAMLFIND) query -r -predicates byte gettext.extract -i-format` \
-           `$(OCAMLFIND) query -r -predicates byte gettext.extract -a-format` \
diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec
index 40489b1..9507c5d 100644
--- a/ocaml-gettext.spec
+++ b/ocaml-gettext.spec
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-gettext
-Version:        0.3.2
-Release:        9%{?dist}
+Version:        0.3.3
+Release:        1%{?dist}
 Summary:        OCaml library for i18n
 
 Group:          Development/Libraries
@@ -13,14 +13,11 @@ Source0:        http://sylvain.le-gall.net/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
-# Fix dynlink.cma now required with OCaml 3.11.0.
-Patch0:         ocaml-gettext-0.3.2-dynlink.patch
-
 BuildRequires:  ocaml >= 3.11.0-1
 BuildRequires:  ocaml-findlib-devel >= 1.2.1-3
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
-BuildRequires:  ocaml-fileutils-devel
+BuildRequires:  ocaml-fileutils-devel >= 0.4.0
 BuildRequires:  ocaml-camlidl-devel
 BuildRequires:  ocaml-ounit-devel
 BuildRequires:  docbook-style-xsl
@@ -66,7 +63,7 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 # BZ 446919.
-Requires:       ocaml-fileutils-devel
+Requires:       ocaml-fileutils-devel >= 0.4.0
 
 
 %description    devel
@@ -101,7 +98,6 @@ signature files for developing applications that use
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -171,8 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/ocaml/gettext-stub/*.cmxa
 %exclude %{_libdir}/ocaml/gettext-stub/*.cmx
 %endif
+%exclude %{_libdir}/ocaml/gettext/*.ml
 %exclude %{_libdir}/ocaml/gettext/*.mli
-%exclude %{_libdir}/ocaml/gettext-stub/*.mli
+%exclude %{_libdir}/ocaml/gettext-stub/*.ml
 %{_libdir}/ocaml/stublibs/*.so
 %{_libdir}/ocaml/stublibs/*.so.owner
 
@@ -189,8 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/gettext-stub/*.cmxa
 %{_libdir}/ocaml/gettext-stub/*.cmx
 %endif
+%{_libdir}/ocaml/gettext/*.ml
 %{_libdir}/ocaml/gettext/*.mli
-%{_libdir}/ocaml/gettext-stub/*.mli
+%{_libdir}/ocaml/gettext-stub/*.ml
 %{_bindir}/ocaml-gettext
 %{_bindir}/ocaml-xgettext
 
@@ -221,6 +219,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov  2 2009 Richard W.M. Jones <rjones@redhat.com> - 0.3.3-1
+- New upstream release 0.3.3 (mainly small bugfixes).
+- This requires ocaml-fileutils 0.4.0 and is incompatible with
+  any earlier version.
+- Fixed a number of rpmlint warnings with *.ml files in the
+  non-devel package.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index f1b382e..42de9f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a68e0574f7a668d645503ffe466c3500  ocaml-gettext-0.3.2.tar.gz
+f1105a62770e6175490e79b803d59e0c  ocaml-gettext-0.3.3.tar.gz