diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index 5eb2b5b..2dd807e 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -1,16 +1,6 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-# On s/390x, ocamlfind is still built using -custom option, so it must
-# not be stripped.  See:
-# https://fedoraproject.org/wiki/Packaging:OCaml?rd=Packaging/OCaml#Stripping_binaries
-%if !%opt
-%global __strip /bin/true
-%global debug_package %{nil}
-%endif
-
-
 Name:           ocaml-findlib
 Version:        1.7.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Objective CAML package manager and build helper
 License:        BSD
 
@@ -64,7 +54,7 @@ cat src/findlib/ocaml_args.ml
   -mandir %{_mandir} \
   -with-toolbox
 make all
-%if %opt
+%ifarch %{ocaml_native_compiler}
 make opt
 %endif
 rm doc/guide-html/TIMESTAMP
@@ -89,7 +79,7 @@ make install \
 %{_libdir}/ocaml/*/META
 %{_libdir}/ocaml/topfind
 %{_libdir}/ocaml/findlib
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/findlib/*.a
 %exclude %{_libdir}/ocaml/findlib/*.cmxa
 %endif
@@ -102,7 +92,7 @@ make install \
 
 %files devel
 %doc LICENSE doc/README doc/guide-html
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/findlib/*.a
 %{_libdir}/ocaml/findlib/*.cmxa
 %endif
@@ -111,6 +101,10 @@ make install \
 
 
 %changelog
+* Fri Sep 22 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-6
+- Enable stripping and debuginfo on s390x.
+- Use ocaml_native_compiler macro instead of opt test.
+
 * Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-5
 - OCaml 4.05.0 rebuild.