diff --git a/ocaml-curses.changes b/ocaml-curses.changes
index 08da758..7466453 100644
--- a/ocaml-curses.changes
+++ b/ocaml-curses.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-curses.spec b/ocaml-curses.spec
index 89baff5..f440bc9 100644
--- a/ocaml-curses.spec
+++ b/ocaml-curses.spec
@@ -19,10 +19,10 @@
 Name:           ocaml-curses
 Version:        1.0.3
 Release:        0
-%{ocaml_preserve_bytecode}
+%{?ocaml_preserve_bytecode}
 Summary:        OCaml bindings for ncurses
 License:        LGPL-2.1+
-Group:          Development/Libraries/Other
+Group:          Development/Languages/OCaml
 Url:            http://savannah.nongnu.org/projects/ocaml-tmk/
 Source0:        http://download.savannah.gnu.org/releases/ocaml-tmk/%{name}-%{version}.tar.gz
 Patch0:         curses.const.patch
@@ -33,19 +33,13 @@ BuildRequires:  ocaml-oasis
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-rpm-macros >= 4.03
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# ocaml autodep start for pkg: ocaml-curses
-# 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-curses
 
 %description
 OCaml bindings for ncurses.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries/Other
+Group:          Development/Languages/OCaml
 Requires:       %{name} = %{version}
 
 %description    devel
@@ -85,7 +79,7 @@ Library curses
  Install: true
  Modules: Curses
  CSources: ml_curses.c, config.h
- CCOpt: -Wall -O2 -g -I$PWD -Werror -D_GNU_SOURCE -DHAVE_CONFIG_H
+ CCOpt: %{optflags} -fPIC -I$PWD -Werror -D_GNU_SOURCE -DHAVE_CONFIG_H
  CCLib: -lncursesw
 
 Document curses
@@ -106,7 +100,7 @@ _EOF_
 %ocaml_oasis_findlib_install
 #
 mkdir -vp %{buildroot}/etc/ld.so.conf.d/
-tee %{buildroot}/etc/ld.so.conf.d/%{name}-stub.conf <<_EOF_
+tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_
 %{_libdir}/ocaml/curses
 _EOF_
 #
@@ -120,7 +114,7 @@ _EOF_
 %doc COPYING
 /etc/ld.so.conf.d/*.conf
 %dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmxs
 %endif
 %{_libdir}/ocaml/*/*.so
@@ -131,7 +125,7 @@ _EOF_
 %{oasis_docdir_html}
 %dir %{_libdir}/ocaml/*
 %{_libdir}/ocaml/*/*.a
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmx
 %{_libdir}/ocaml/*/*.cmxa
 %endif