diff --git a/apache2-mod_perl.changes b/apache2-mod_perl.changes
index 4badee7..97b5d1f 100644
--- a/apache2-mod_perl.changes
+++ b/apache2-mod_perl.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug  4 08:29:01 UTC 2015 - schwab@suse.de
+
+- Force gnu89 inline semantics
+- Disable tests only in QEMU user-space builds
+- inline.patch: remove
+
 -------------------------------------------------------------------
 Tue Jul 28 14:08:01 UTC 2015 - pgajdos@suse.com
 
diff --git a/apache2-mod_perl.spec b/apache2-mod_perl.spec
index acb5044..b2770d8 100644
--- a/apache2-mod_perl.spec
+++ b/apache2-mod_perl.spec
@@ -26,7 +26,6 @@ License:        Apache-2.0
 Group:          Productivity/Networking/Web/Servers
 Url:            http://perl.apache.org/
 Source0:        http://apache.miloslavbrada.cz/perl/%{srcname}-%{version}.tar.gz
-Patch0:         inline.patch
 Patch1:         avoid-broken-provides.diff
 BuildRequires:  apache-rpm-macros
 BuildRequires:  apache2-devel
@@ -101,16 +100,15 @@ software depending on apache2-mod_perl.
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0
 %patch1 -p1
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs} MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags}"
+perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs} MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags} -fgnu89-inline"
 make %{?_smp_mflags}
 #
 # Run tests
 #
-%ifnarch %{arm}
+%if !0%{?qemu_user_space_build}
 mkdir t/run
 # workaround for 32-bit where /usr/lib64/apache2-prefork is hardcoded?
 cat >> t/conf/extra.conf.in <<-EOF
diff --git a/inline.patch b/inline.patch
deleted file mode 100644
index 8622e5a..0000000
--- a/inline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/perl/modperl_common_util.h.orig	2015-06-26 17:41:33.538000834 +0100
-+++ src/modules/perl/modperl_common_util.h	2015-06-26 17:42:14.524052878 +0100
-@@ -22,7 +22,7 @@
- #ifdef MP_DEBUG
- #define MP_INLINE
- #else
--#define MP_INLINE APR_INLINE
-+#define MP_INLINE
- #endif
- 
- #ifdef CYGWIN