diff --git a/coq.spec b/coq.spec
index 2379551..618167a 100644
--- a/coq.spec
+++ b/coq.spec
@@ -28,6 +28,10 @@ Source3:        fr.inria.coqide.metainfo.xml
 # https://github.com/coq/coq/pull/16193
 Patch1:         16193.patch
 
+# ANTLR is unavailable on i686
+# See https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
+ExclusiveArch:  %{java_arches}
+
 BuildRequires:  ocaml >= 4.05.0
 BuildRequires:  ocaml-dune >= 2.5.0
 BuildRequires:  ocaml-findlib >= 1.8.1
@@ -199,7 +203,7 @@ cd -
 
 # Set our configuration options
 ./configure -prefix %{_prefix}                       \
-            -libdir %{_libdir}/ocaml/coq             \
+            -libdir %{ocamldir}/coq                  \
             -mandir %{_mandir}                       \
             -docdir %{coqdocdir}                     \
             -configdir %{_sysconfdir}/xdg/%{name}    \
@@ -216,8 +220,8 @@ make world VERBOSE=1
 %make_install
 
 # FIXME: why didn't this install in libdir?
-mkdir -p %{buildroot}%{_libdir}/ocaml
-mv %{buildroot}%{_prefix}/lib/{coq*,stublibs} %{buildroot}%{_libdir}/ocaml
+mkdir -p %{buildroot}%{ocamldir}
+mv %{buildroot}%{_prefix}/lib/{coq*,stublibs} %{buildroot}%{ocamldir}
 
 # Install the LaTeX style file
 mkdir -p %{buildroot}%{_texmf_main}/tex/latex/misc
@@ -282,26 +286,26 @@ ln -s ../../coq/coq_style.xml %{buildroot}%{_datadir}/gtksourceview-3.0/styles
 rm -fr %{buildroot}%{_prefix}/doc
 
 # Byte compile the tools
-%py_byte_compile %{python3} %{buildroot}%{_libdir}/ocaml/coq/tools
+%py_byte_compile %{python3} %{buildroot}%{ocamldir}/coq/tools
 
 # Install opam files
-cp -p coq.opam %{buildroot}%{_libdir}/ocaml/coq/opam
+cp -p coq.opam %{buildroot}%{ocamldir}/coq/opam
 
-mkdir -p %{buildroot}%{_libdir}/ocaml/coq-stdlib
-cp -p coq-stdlib.opam %{buildroot}%{_libdir}/ocaml/coq-stdlib/opam
+mkdir -p %{buildroot}%{ocamldir}/coq-stdlib
+cp -p coq-stdlib.opam %{buildroot}%{ocamldir}/coq-stdlib/opam
 
-mkdir -p %{buildroot}%{_libdir}/ocaml/coq-doc
-cp -p coq-doc.opam %{buildroot}%{_libdir}/ocaml/coq-doc/opam
+mkdir -p %{buildroot}%{ocamldir}/coq-doc
+cp -p coq-doc.opam %{buildroot}%{ocamldir}/coq-doc/opam
 
 %files
-%{_libdir}/ocaml/coq/
-%{_libdir}/ocaml/coq-stdlib/
+%{ocamldir}/coq/
+%{ocamldir}/coq-stdlib/
 
 %files core
 %doc README.md
 %license LICENSE
-%{_libdir}/ocaml/coq-core/
-%{_libdir}/ocaml/stublibs/dllcoqrun_stubs.so
+%{ocamldir}/coq-core/
+%{ocamldir}/stublibs/dllcoqrun_stubs.so
 %{_bindir}/coqc*
 %{_bindir}/coqdep
 %{_bindir}/coqdoc
@@ -334,11 +338,11 @@ cp -p coq-doc.opam %{buildroot}%{_libdir}/ocaml/coq-doc/opam
 %{_texmf_main}/tex/latex/misc/
 # This should really go in the doc subpackage, but because it is installed in
 # an arch-specific path, it cannot be part of a noarch package.
-%{_libdir}/ocaml/coq-doc/
+%{ocamldir}/coq-doc/
 
 %files coqide-server
 %{_bindir}/coqidetop*
-%{_libdir}/ocaml/coqide-server/
+%{ocamldir}/coqide-server/
 
 %files coqide
 %doc ide/coqide/FAQ
@@ -354,7 +358,7 @@ cp -p coq-doc.opam %{buildroot}%{_libdir}/ocaml/coq-doc/opam
 %{_datadir}/icons/hicolor/512x512/apps/coq.png
 %{_datadir}/icons/hicolor/512x512/mimetypes/coqfile.png
 %{_mandir}/man1/coqide.1*
-%{_libdir}/ocaml/coqide/
+%{ocamldir}/coqide/
 %{_metainfodir}/fr.inria.coqide.metainfo.xml
 %{_datadir}/applications/fr.inria.coqide.desktop
 %{_datadir}/gtksourceview-3.0/language-specs/coq*.lang
@@ -367,6 +371,10 @@ cp -p coq-doc.opam %{buildroot}%{_libdir}/ocaml/coq-doc/opam
 %{coqdocdir}
 
 %changelog
+* Tue Jul 19 2022 Jerry James <loganjerry@gmail.com> - 8.15.2-2
+- Remove i686 support
+- Use new OCaml macros
+
 * Mon Jun 20 2022 Jerry James <loganjerry@gmail.com> - 8.15.2-2
 - Rebuild for antlr4-project 4.10.1