diff --git a/coq.spec b/coq.spec
index c6d2a9d..44c82ce 100644
--- a/coq.spec
+++ b/coq.spec
@@ -17,7 +17,7 @@
 
 Name:           coq
 Version:        8.3pl2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Proof management system
 
 Group:          Applications/Engineering
@@ -144,9 +144,6 @@ for f in CHANGES CREDITS doc/LICENSE; do
   mv -f $f.utf8 $f
 done
 
-# Fix for bad URLs in coq 8.3p1
-sed -i -e 's|"distrib/"|"distrib/V"|' configure
-
 cp -p %SOURCE1 %SOURCE2 %SOURCE3 .
 
 %build
@@ -212,22 +209,13 @@ mkdir -p %{buildroot}%{coqdatadir}/`dirname $f` && cp -p $f %{buildroot}%{coqdat
 done
 
 # Install tutorial code
-mkdir -p %{buildroot}%{_datadir}/coq
-%global tutorialcodedir %{_datadir}/coq/RecTutorial
+%global tutorialcodedir %{coqdatadir}/RecTutorial
 %if %(test -d %{buildroot}%{tutorialcodedir} && echo 1 || echo 0) != 1
 mkdir -p %{buildroot}%{tutorialcodedir}
 %endif
 cp -p doc/RecTutorial/RecTutorial.v %{buildroot}%{tutorialcodedir}
 ln -s %{tutorialcodedir} %{buildroot}%{coqdatadir}/RecTutorial
 
-# Move noarch bits to datadir, but leave symlinks behind.
-# TODO: Consider making the noarch bits a separate subpackage.
-for dir in ide interp kernel lib library parsing pretyping proofs states \
-           tactics theories tools toplevel user-contrib; do
-  mv %{buildroot}%{coqdatadir}/$dir %{buildroot}%{_datadir}/coq
-  ln -s %{_datadir}/coq/$dir %{buildroot}%{coqdatadir}/$dir
-done
-
 # Install documentation not installed by install-doc in Makefile
 for f in CHANGES COMPATIBILITY COPYRIGHT CREDITS INSTALL LICENSE README;
 do cp -p $f %{buildroot}%{coqdocdir};
@@ -275,15 +263,13 @@ fi
 # DON'T use the doc macro here or else it wipes out all the other documentation installed!
 %{_mandir}/man1/*
 %{coqdatadir}
-%{_datadir}/coq
 %{_bindir}/coq*
 %{_bindir}/gallina
 %exclude %{_bindir}/coqide*
-%exclude %{_datadir}/coq/ide
 %exclude %{coqdatadir}/ide
 %if %{opt}
-%exclude %{_datadir}/coq/*/*.cmxa
-%exclude %{_datadir}/coq/*/*.a
+%exclude %{coqdatadir}/*/*.cmxa
+%exclude %{coqdatadir}/*/*.a
 %endif
 %{tex_dir}/coq*
 # A few documentation files here should stay in the main package (and
@@ -302,10 +288,9 @@ fi
 %defattr(-,root,root,-)
 %doc INSTALL.ide
 %{_bindir}/coqide*
-%{_datadir}/coq/ide
 %{coqdatadir}/ide
-%exclude %{_datadir}/coq/ide/ide.cmxa
-%exclude %{_datadir}/coq/ide/ide.a
+%exclude %{coqdatadir}/ide/ide.cmxa
+%exclude %{coqdatadir}/ide/ide.a
 
 # Is it ok to assume this is what desktop-file-install renames coqide.desktop to?
 %{_datadir}/applications/fedora-coqide.desktop
@@ -344,6 +329,12 @@ fi
 %{_xemacs_sitelispdir}/coq/*.el
 
 %changelog
+* Wed Jun 15 2011 Jerry James <loganjerry@gmail.com> - 8.3pl2-2
+- Remove workaround for bad documentation link in 8.3pl1, fixed in 8.3pl2
+- Revert change in 8.3pl1-1 to split arch-specific stuff from noarch stuff.
+  Coq tactics are written in ocaml, which compiles to arch-specific files,
+  and those files are stored in the same place as the noarch proof files.
+
 * Tue Apr 26 2011 Jerry James <loganjerry@gmail.com> - 8.3pl2-1
 - New upstream release
 - Change the list of supported arches to match the ocaml list, except for