diff --git a/iperf.changes b/iperf.changes
index 62cc62d..8a947ad 100644
--- a/iperf.changes
+++ b/iperf.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec 26 16:14:38 UTC 2014 - schwab@linux-m68k.org
+
+- Apply profiling patch whenever %optflags includes -fomit-frame-pointer
+
 -------------------------------------------------------------------
 Thu Jul 17 20:12:49 UTC 2014 - msvec@suse.com
 
diff --git a/iperf.spec b/iperf.spec
index d214072..a095788 100644
--- a/iperf.spec
+++ b/iperf.spec
@@ -25,7 +25,7 @@ License:        BSD-3-Clause
 Group:          Productivity/Networking/Diagnostic
 Url:            http://software.es.net/iperf/
 Source:         http://downloads.es.net/pub/iperf/%{name}-%{version}.tar.gz
-# PATCH-FIX-OPENSUSE -- Disable profiling on i586, as option -pg conflicts with -fomit-frame-pointer
+# PATCH-FIX-OPENSUSE -- Disable profiling if %optflags includes -fomit-frame-pointer, as option -pg conflicts with it
 Patch1:         iperf-3.0.5_disable-profiling.patch
 %if %{?sles_version} && %{?sles_version} <= 11
 BuildRequires:  libuuid-devel
@@ -80,7 +80,7 @@ This package contains development files.
 
 %prep
 %setup -q
-%ifarch i386 i486 i586 i686
+%if 0%(case "%optflags" in (*-fomit-frame-pointer*) echo 1;; esac)
 %patch1 -p 1
 %endif