diff --git a/ocaml-curses.changes b/ocaml-curses.changes
index d5d492d..37c0a7b 100644
--- a/ocaml-curses.changes
+++ b/ocaml-curses.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  8 20:39:57 UTC 2014 - mlatimer@suse.com
+
+- Update spec file to use ocaml-rpm-macros, remove
+  ExclusiveArch, and ensure bytecode is built
+
 -------------------------------------------------------------------
 Fri Dec  5 17:52:56 UTC 2014 - mlatimer@suse.com
 
diff --git a/ocaml-curses.spec b/ocaml-curses.spec
index 80929bf..38b1c66 100644
--- a/ocaml-curses.spec
+++ b/ocaml-curses.spec
@@ -16,10 +16,9 @@
 #
 
 
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-
 Name:           ocaml-curses
 Version:        1.0.3
+%{ocaml_preserve_bytecode}
 Release:        0
 Summary:        OCaml bindings for ncurses
 License:        LGPL-2.0+
@@ -33,9 +32,9 @@ BuildRequires:  gawk
 BuildRequires:  libtool
 BuildRequires:  ncurses-devel
 BuildRequires:  ocaml >= 4.00.1
+BuildRequires:  ocaml-rpm-macros >= 4.02.1
 BuildRequires:  ocaml-findlib-devel >= 1.3.3-3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExcludeArch:    sparc64 s390 s390x
 
 %description
 OCaml bindings for ncurses.
@@ -78,7 +77,7 @@ ocamlfind install curses META *.cmi *.cmx *.cma *.cmxa *.a *.so *.mli
 %defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/ocaml/curses
-%if %{opt}
+%if %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/curses/*.a
 %exclude %{_libdir}/ocaml/curses/*.cmxa
 %exclude %{_libdir}/ocaml/curses/*.cmx
@@ -90,7 +89,7 @@ ocamlfind install curses META *.cmi *.cmx *.cma *.cmxa *.a *.so *.mli
 %files devel
 %defattr(-,root,root,-)
 %doc COPYING
-%if %{opt}
+%if %{ocaml_native_compiler}
 %{_libdir}/ocaml/curses/*.a
 %{_libdir}/ocaml/curses/*.cmxa
 %{_libdir}/ocaml/curses/*.cmx