diff --git a/cil-1.7.3-enable-ocamlopt-g.patch b/cil-1.7.3-enable-ocamlopt-g.patch
new file mode 100644
index 0000000..4098d57
--- /dev/null
+++ b/cil-1.7.3-enable-ocamlopt-g.patch
@@ -0,0 +1,7 @@
+--- cil-1.7.3/_tags~	2013-07-24 16:07:11.000000000 +0100
++++ cil-1.7.3/_tags	2013-09-14 16:23:32.520889558 +0100
+@@ -4,3 +4,4 @@
+ "test": not_hygienic
+ # build every cmo in debug mode (for cil.cma)
+ <**/*.cmo>: debug
++<**/*.cmx>: debug
diff --git a/ocaml-cil.spec b/ocaml-cil.spec
index af57d25..478a030 100644
--- a/ocaml-cil.spec
+++ b/ocaml-cil.spec
@@ -1,12 +1,11 @@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           ocaml-cil
 Version:        1.7.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
-
 License:        BSD
+
 URL:            http://cil.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/cil/cil-%{version}.tar.gz
 
@@ -20,6 +19,9 @@ BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-ocamldoc
 Patch0:         0001-Fix-testsuite-on-32-bit-machines.patch
 Patch1:         0002-Do-not-fail-testsuite-on-new-gcc-behaviour.patch
 
+# Enable ocamlopt -g.
+Patch2:         cil-1.7.3-enable-ocamlopt-g.patch
+
 %description
 CIL (C Intermediate Language) is a high-level representation along
 with a set of tools that permit easy analysis and source-to-source
@@ -99,6 +101,7 @@ for gcc.
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -106,6 +109,7 @@ export PERL_MM_OPT=INSTALLDIRS=vendor
 
 %configure
 # make -j is broken, do not use it
+unset MAKEFLAGS
 make all doc
 # Force build of bytecode version even if ocamlopt is available
 make OCAMLBEST= bin/cilly.byte
@@ -172,6 +176,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-3
+- Rebuild for OCaml 4.01.0.
+- Enable debuginfo.
+
 * Tue Sep  3 2013 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-2
 - ExcludeArch armv7hl (RHBZ#994968).