diff --git a/ocaml-camlidl.spec b/ocaml-camlidl.spec
index 336a661..a9e1ad9 100644
--- a/ocaml-camlidl.spec
+++ b/ocaml-camlidl.spec
@@ -2,7 +2,7 @@
 
 Name:           ocaml-camlidl
 Version:        1.05
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Stub code generator and COM binding for Objective Caml
 License:        QPL and LGPLv2 with exceptions
 
@@ -17,6 +17,7 @@ ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml
 BuildRequires:  ocaml-ocamldoc
+BuildRequires:  perl
 
 
 %description
@@ -66,14 +67,11 @@ sed -e 's|^OCAMLLIB=.*|OCAMLLIB=%{_libdir}/ocaml|' \
 # reason).
 mv compiler/array.ml compiler/idlarray.ml
 mv compiler/array.mli compiler/idlarray.mli
-for f in compiler/*.ml; do
-  mv $f $f.orig
-  sed -e 's|Array|Idlarray|g' < $f.orig > $f
-done
-mv compiler/Makefile compiler/Makefile.orig
-sed -e 's|array.cmo|idlarray.cmo|g' < compiler/Makefile.orig > compiler/Makefile
-mv compiler/.depend compiler/.depend.orig
-sed -e 's|array|idlarray|g' < compiler/.depend.orig > compiler/.depend
+
+perl -pi.bak -e 's/array/idlarray/g' \
+  compiler/Makefile compiler/.depend
+perl -pi.bak -e 's/Array(?!\d)/Idlarray/g' \
+  compiler/*.ml
 %endif
 
 cp %{SOURCE1} .
@@ -122,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 1.05-20
+* Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 1.05-21
 - Rebuild for OCaml 4.01.0.
 - Enable debuginfo.
 - Modernize the spec file.