diff --git a/ocaml-cil.spec b/ocaml-cil.spec
index 135da62..b2add96 100644
--- a/ocaml-cil.spec
+++ b/ocaml-cil.spec
@@ -1,9 +1,12 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
 
+# Prevent unwanted bytecode stripping by RPM.
+%define __strip /bin/true
+
 Name:           ocaml-cil
 Version:        1.3.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
 
 Group:          Development/Libraries
@@ -137,6 +140,8 @@ install -m 0755 bin/cilly $DESTDIR%{_bindir}
 mkdir -p $DESTDIR%{_libexecdir}/cil/obj/$archos
 install -m 0755 obj/$archos/cilly.*.exe $DESTDIR%{_libexecdir}/cil/obj/$archos
 
+mkdir -p $DESTDIR/etc/prelink.conf.d
+echo -- '-b /usr/libexec/cil' > $DESTDIR/etc/prelink.conf.d/ocaml-cil-cilly.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,6 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/ocaml/cil/*.cmx
 %endif
 %exclude %{_libdir}/ocaml/cil/*.mli
+%exclude %{_libdir}/ocaml/cil/*.ml
 
 
 %files devel
@@ -163,6 +169,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/cil/*.cmx
 %endif
 %{_libdir}/ocaml/cil/*.mli
+%{_libdir}/ocaml/cil/*.ml
 
 
 %files doc
@@ -179,9 +186,14 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/TempFile.pm
 %{_bindir}/cilly
 %{_libexecdir}/cil
+%config(noreplace) /etc/prelink.conf.d/ocaml-cil-cilly.conf
 
 
 %changelog
+* Tue Sep  2 2008 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-7
+- Prevent unwanted bytecode stripping by RPM and prelink.
+- Place *.ml files into the -devel subpackage.
+
 * Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-6
 - Fix Perl paths (rhbz#453759).