diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes
index c7f50e1..5101dd2 100644
--- a/ocaml-findlib.changes
+++ b/ocaml-findlib.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de
+
+- Wrap specfile conditionals to fix quilt setup
+
 -------------------------------------------------------------------
 Mon Jul 17 10:48:58 UTC 2017 - ohering@suse.de
 
diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index bcc0b94..576d8b6 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -20,7 +20,9 @@
 Name:           ocaml-findlib
 Version:        1.6.2
 Release:        0
+%if %{defined ocaml_preserve_bytecode}
 %{ocaml_preserve_bytecode}
+%endif
 Summary:        Objective CAML package manager and build helper
 License:        MIT
 Group:          Development/Libraries/Other
@@ -86,7 +88,7 @@ tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocam
   -mandir %{_mandir} \
   -with-toolbox
 make all
-%if %{ocaml_native_compiler}
+%if %{defined ocaml_native_compiler}
 make opt
 %endif
 rm doc/guide-html/TIMESTAMP
@@ -128,7 +130,7 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
 #
 %{_libdir}/ocaml/topfind
 %dir %{_libdir}/ocaml/findlib
-%if %{ocaml_native_compiler}
+%if %{defined ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmxs
 %endif
 
@@ -142,7 +144,7 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
 %dir %{_libdir}/ocaml/num-top
 %{_libdir}/ocaml/findlib/META
 %{_libdir}/ocaml/num-top/META
-%if %{ocaml_native_compiler}
+%if %{defined ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.a
 %{_libdir}/ocaml/*/*.cmxa
 %endif