diff --git a/ocaml-menhir.changes b/ocaml-menhir.changes
index 0a1fb25..b92960b 100644
--- a/ocaml-menhir.changes
+++ b/ocaml-menhir.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-menhir.spec b/ocaml-menhir.spec
index 12181a8..a5ec70b 100644
--- a/ocaml-menhir.spec
+++ b/ocaml-menhir.spec
@@ -19,7 +19,9 @@
 Name:           ocaml-menhir
 Version:        20160504
 Release:        0
+%if %{defined ocaml_preserve_bytecode}
 %{ocaml_preserve_bytecode}
+%endif
 Summary:        LR(1) parser generator for the OCaml programming language
 License:        LGPL-2.0
 Group:          Development/Libraries/Other
@@ -50,7 +52,7 @@ developing applications that use %{name}.
 %build
 o=
 make \
-%if %{ocaml_native_compiler}
+%if %{defined ocaml_native_compiler}
 	TARGET=native \
 %else
 	TARGET=byte \
@@ -65,7 +67,7 @@ OCAMLFIND_DESTDIR=%{buildroot}`ocamlc -where`
 mkdir -vp ${OCAMLFIND_DESTDIR}
 make \
 	install \
-%if %{ocaml_native_compiler}
+%if %{defined ocaml_native_compiler}
 	TARGET=native \
 %else
 	TARGET=byte \
@@ -84,7 +86,7 @@ rm -rfv %{buildroot}/usr/share/doc
 %dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/*
 %{_libdir}/ocaml/*/META
-%if %{ocaml_native_compiler}
+%if %{defined ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.o
 %endif
 %{_libdir}/ocaml/*/*.cmi
@@ -96,7 +98,7 @@ rm -rfv %{buildroot}/usr/share/doc
 %{_mandir}/*/*
 %dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if %{defined ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmx
 %endif
 %{_libdir}/ocaml/*/*.mli