diff --git a/unison.changes b/unison.changes
index 28141f7..e3c3b63 100644
--- a/unison.changes
+++ b/unison.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 16 16:40:46 CET 2013 - ohering@suse.de
+
+- disable strip and /usr/lib/rpm/find-debuginfo.sh for non-opt builds
+  it destroys bytecode binaries
+
 -------------------------------------------------------------------
 Mon Jan 14 08:05:03 UTC 2013 - saschpe@suse.de
 
diff --git a/unison.spec b/unison.spec
index 8ee9b5f..c6d7a6f 100644
--- a/unison.spec
+++ b/unison.spec
@@ -16,6 +16,14 @@
 #
 
 
+%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%if !%opt
+# get rid of /usr/lib/rpm/find-debuginfo.sh
+# strip kills the bytecode part of ELF binaries
+# see also NO_BRP_STRIP_DEBUG in install section
+%undefine _build_create_debug
+%endif
+
 Name:           unison
 Version:        2.40.102
 Release:        0
@@ -51,23 +59,25 @@ replica to the other.
 # This package failed when testing with -Wl,-as-needed being default.
 # So we disable it here, if you want to retest, just delete this comment and the line below.
 export SUSE_ASNEEDED=0
-%ifarch s390 s390x
-make UISTYLE=gtk2 NATIVE=false THREADS=false
+%if %opt
+NATIVE=true
 %else
-make UISTYLE=gtk2 NATIVE=true THREADS=true
+NATIVE=false
 %endif
+make UISTYLE=gtk2 NATIVE=$NATIVE THREADS=true
 
 %install
+%if !%opt
+# get rid of /usr/lib/rpm/brp-strip-debug 
+# strip kills the bytecode part of ELF binaries
+export NO_BRP_STRIP_DEBUG=true
+%endif
 install -m 755 -d %{buildroot}/%{_bindir}
 install -m 755 %name %{buildroot}%{_bindir}
 install -m 755 -d %{buildroot}/%{_prefix}/share/pixmaps
 install -m 644 %{SOURCE3} %{buildroot}/%{_prefix}/share/pixmaps
 install -m 644 %{SOURCE1} unison-manual.html
 %suse_update_desktop_file -i %name Utility SyncUtility
-%ifarch s390 s390x
-# do not strip non-optimized builds
-export NO_BRP_STRIP_DEBUG=true
-%endif
 
 %files
 %defattr(-,root,root)