diff --git a/ocaml-libvirt.changes b/ocaml-libvirt.changes
index 57e569d..20ef8f6 100644
--- a/ocaml-libvirt.changes
+++ b/ocaml-libvirt.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de
+
+- Use Group: Development/Languages/OCaml
+
+-------------------------------------------------------------------
+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
+
+- Remove autodeps for pre openSUSE 12.1 releases
+
 -------------------------------------------------------------------
 Wed May 31 07:07:33 UTC 2017 - olaf@aepfle.de
 
diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec
index 13dbc55..63ad223 100644
--- a/ocaml-libvirt.spec
+++ b/ocaml-libvirt.spec
@@ -19,10 +19,10 @@
 Name:           ocaml-libvirt
 Version:        0.6.1.4.20160205.8853f5a
 Release:        0
-%{ocaml_preserve_bytecode}
+%{?ocaml_preserve_bytecode}
 Summary:        OCaml binding for libvirt
 License:        LGPL-2.0+
-Group:          Development/Libraries/Other
+Group:          Development/Languages/OCaml
 Url:            http://libvirt.org/ocaml/
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  ocaml
@@ -33,19 +33,13 @@ BuildRequires:  perl
 BuildRequires:  pkgconfig(libvirt)
 Requires:       libvirt-client >= 0.9.10-3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# ocaml autodep start for pkg: ocaml-libvirt
-# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires
-%if 0%{?suse_version} < 1210
-Requires:       ocaml-runtime
-%endif
-# ocaml autodep end for pkg: ocaml-libvirt
 
 %description
 OCaml binding for libvirt.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
+Group:          Development/Languages/OCaml
 Requires:       %{name} = %{version}
 
 %description    devel
@@ -96,7 +90,7 @@ Library mllibvirt
  FindlibName: libvirt
  BuildDepends: unix
  CSources: libvirt_c.c
- CCOpt: -Wall -O2 -g -I$PWD -I$PWD/libvirt -Werror -D_GNU_SOURCE ${libvirt_cflags}
+ CCOpt: %{optflags} -I$PWD -I$PWD/libvirt -Werror -D_GNU_SOURCE ${libvirt_cflags}
  CCLib: ${libvirt_libs}
 
 Document libvirt
@@ -161,7 +155,7 @@ _EOF_
 %{_bindir}/*
 %dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmxs
 %endif
 %{_libdir}/ocaml/*/*.so
@@ -173,7 +167,7 @@ _EOF_
 %dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/*
 %{_libdir}/ocaml/*/*.a
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmx
 %{_libdir}/ocaml/*/*.cmxa
 %endif