diff --git a/coq.spec b/coq.spec
index cf3f340..b0a9ad0 100644
--- a/coq.spec
+++ b/coq.spec
@@ -25,7 +25,7 @@
 
 Name:		coq
 Version:	8.1pl3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Coq proof management system
 
 Group:		Applications/Engineering
@@ -216,8 +216,10 @@ make world
 # Fix permissions in the documentation
 chmod -R a+rX refman stdlib
 
-# Clear any execstack permissions that binaries may have
-execstack -c bin/*
+# Clear any execstack permissions that ELF binaries may have
+for f in bin/*; do
+file $f | grep "ELF" && execstack -c $f
+done
 
 %install
 rm -rf %{buildroot}
@@ -238,6 +240,12 @@ desktop-file-install --vendor="fedora"			\
 --dir=%{buildroot}%{_datadir}/applications		\
 coqide.desktop
 
+# Install main Coq .v files
+
+for d in `find contrib theories -mindepth 1 -maxdepth 1 -type d`; do
+ls $d/*.v 1>/dev/null 2>&1 && mkdir -p %{buildroot}%{coqdatadir}/$d && cp -pr $d/*.v %{buildroot}%{coqdatadir}/$d 2>/dev/null || true
+done
+
 # Install tutorial code
 
 %define tutorialcodedir %{coqdatadir}/tutorial
@@ -272,7 +280,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc CHANGES COMPATIBILITY COPYRIGHT CREDITS INSTALL KNOWN-BUGS LICENSE README
 %doc %{_mandir}/man1/*
-%{_datadir}/coq
+%{coqdatadir}
 %{_bindir}/coq*
 %{_bindir}/gallina
 # %%{_bindir}/coq-parser
@@ -281,9 +289,9 @@ rm -rf %{buildroot}
 # %%endif
 # Exclude ide files to put in a separate package
 %exclude %{_bindir}/coqide*
-%exclude %{_datadir}/coq/ide
+%exclude %{coqdatadir}/ide
 %if %{opt}
-%exclude %{_datadir}/coq/*.cmxa
+%exclude %{coqdatadir}/*.cmxa
 %endif
 %{tex_dir}/coq*
 # We DO want to replace any such file with this name - it will only be
@@ -323,6 +331,8 @@ rm -rf %{buildroot}
 %doc README.coq-emacs
 
 %changelog
+* Wed Oct 22 2008 Alan Dunn <amdunn@gmail.com> 8.1pl3-5
+- Added Coq .v files into the main package at user request.
 * Tue Sep 09 2008 Alan Dunn <amdunn@gmail.com> 8.1pl3-4
 - Added creation of prelink blacklist for any bytecode files.
 - Fixed execstack status for binaries.
diff --git a/import.log b/import.log
index 1e5a882..013b6a6 100644
--- a/import.log
+++ b/import.log
@@ -4,3 +4,4 @@ coq-8_1pl3-2_fc8:F-8:coq-8.1pl3-2.fc8.src.rpm:1216557367
 coq-8_1pl3-2_fc8_1:F-8:coq-8.1pl3-2.fc8.1.src.rpm:1216558147
 coq-8_1pl3-3_fc8:F-8:coq-8.1pl3-3.fc8.src.rpm:1217987468
 coq-8_1pl3-4_fc8:F-8:coq-8.1pl3-4.fc8.src.rpm:1221066654
+coq-8_1pl3-5_fc8:F-8:coq-8.1pl3-5.fc8.src.rpm:1224848194