diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
index 289d9bab1..93522aff3 100644
--- a/extra/qt4/PKGBUILD
+++ b/extra/qt4/PKGBUILD
@@ -12,8 +12,8 @@
 
 pkgname=qt4
 pkgver=4.8.7
-pkgrel=22
-arch=('i686' 'x86_64')
+pkgrel=23
+arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework'
@@ -116,12 +116,14 @@ prepare() {
 
   # Fix build with OpenSSL 1.1 (Debian + OpenMandriva)
   patch -p1 -i "$srcdir"/qt4-openssl-1.1.patch
+
+  echo "QMAKE_CXXFLAGS += -std=gnu++98" >> src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
+  echo "QMAKE_CXXFLAGS += -std=gnu++98" >> src/plugins/accessible/qaccessiblebase.pri
 }
 
 build() {
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-  export CXXFLAGS+=" -std=gnu++98" # Fix build with GCC 6
   
   cd ${_pkgfqn}