diff --git a/ocaml-ounit.spec b/ocaml-ounit.spec
index 67a42c3..c1acdd4 100644
--- a/ocaml-ounit.spec
+++ b/ocaml-ounit.spec
@@ -2,7 +2,7 @@
 
 Name:           ocaml-ounit
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Unit test framework for OCaml
 
 License:        MIT
@@ -41,10 +41,6 @@ sh ./configure --destdir $RPM_BUILD_ROOT
 
 
 %build
-%ifarch %{arm}
-# Workaround for code generator bug on arm (RHBZ#1119049)
-export OCAMLFIND_COMMANDS='ocamlopt=ocamlopt'
-%endif
 make all
 make doc
 
@@ -83,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT/usr/local/share/doc
 
 
 %changelog
+* Mon Jul 14 2014 Richard W.M. Jones <rjones@redhat.com> - 2.0.0-4
+- Remove workaround for code gen bug and try building against
+  possibly fixed compiler.
+
 * Sun Jul 13 2014 Richard W.M. Jones <rjones@redhat.com> - 2.0.0-3
 - Add workaround for code generator bug on ARM (RHBZ#1119049).