diff --git a/ocaml-cppo.changes b/ocaml-cppo.changes
index 50fec18..095fac5 100644
--- a/ocaml-cppo.changes
+++ b/ocaml-cppo.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-cppo.spec b/ocaml-cppo.spec
index 1f47b89..e827375 100644
--- a/ocaml-cppo.spec
+++ b/ocaml-cppo.spec
@@ -20,7 +20,9 @@
 Name:           ocaml-cppo
 Version:        1.5.0
 Release:        0
+%if %{defined ocaml_preserve_bytecode}
 %{ocaml_preserve_bytecode}
+%endif
 Summary:        The C preprocessor written in OCaml
 License:        BSD-3-Clause
 Group:          Development/Libraries/Other
@@ -118,7 +120,7 @@ _EOF_
 %{_bindir}/*
 %dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if %{defined ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmxs
 %endif
 
@@ -127,7 +129,7 @@ _EOF_
 %{oasis_docdir_html}
 %dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if %{defined ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.a
 %{_libdir}/ocaml/*/*.cmx
 %{_libdir}/ocaml/*/*.cmxa