diff --git a/ocaml-cppo.changes b/ocaml-cppo.changes
index 4d37e24..ef55068 100644
--- a/ocaml-cppo.changes
+++ b/ocaml-cppo.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de
+
+- Use Group: Development/Languages/OCaml
+
+-------------------------------------------------------------------
+Mon Jul 17 20:24:18 UTC 2017 - ohering@suse.de
+
+- Update Url
+
+-------------------------------------------------------------------
+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-cppo.spec b/ocaml-cppo.spec
index 074fdd9..fe4ba9d 100644
--- a/ocaml-cppo.spec
+++ b/ocaml-cppo.spec
@@ -20,11 +20,11 @@
 Name:           ocaml-cppo
 Version:        1.5.0
 Release:        0
-%{ocaml_preserve_bytecode}
+%{?ocaml_preserve_bytecode}
 Summary:        The C preprocessor written in OCaml
 License:        BSD-3-Clause
-Group:          Development/Libraries/Other
-Url:            http://mjambon.com/cppo.html
+Group:          Development/Languages/OCaml
+Url:            https://github.com/mjambon/cppo
 Source:         %{name}-%{version}.tar.xz
 BuildRequires:  ocaml
 BuildRequires:  ocaml-oasis
@@ -35,13 +35,6 @@ BuildRequires:  ocamlfind(ocamlbuild)
 BuildRequires:  ocamlfind(str)
 BuildRequires:  ocamlfind(unix)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# ocaml autodep start for pkg: ocaml-cppo
-# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires
-%if 0%{?suse_version} < 1210
-Requires:       ocaml-ocamlbuild
-Requires:       ocaml-runtime
-%endif
-# ocaml autodep end for pkg: ocaml-cppo
 
 %description
 Cppo is an equivalent of the C preprocessor targeted at the OCaml language and
@@ -58,7 +51,7 @@ robustness of cppo across OCaml versions.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries/Other
+Group:          Development/Languages/OCaml
 Requires:       %{name} = %{version}
 
 %description    devel
@@ -125,7 +118,7 @@ _EOF_
 %{_bindir}/*
 %dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmxs
 %endif
 
@@ -134,7 +127,7 @@ _EOF_
 %{oasis_docdir_html}
 %dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.a
 %{_libdir}/ocaml/*/*.cmx
 %{_libdir}/ocaml/*/*.cmxa