diff --git a/src/config-store/wscript b/src/config-store/wscript
index 8e167c7ee..968fcdb05 100644
--- a/src/config-store/wscript
+++ b/src/config-store/wscript
@@ -3,6 +3,8 @@
 import wutils
 from waflib import Options
 
+# Bug 2936 gcc version issue for GTK+ and -Wparentheses
+gcc_version_gtkplus_warning_issue = (8, 0, 0)
 
 def options(opt):
     opt.add_option('--disable-gtk',
@@ -25,6 +27,12 @@ def configure(conf):
                                      conf.env['ENABLE_GTK2'],
                                      "library 'gtk+-2.0 >= 2.12' not found")
 
+        # Bug 2936 -Wparentheses issue for gcc >= 8
+        if conf.env['ENABLE_GTK2']: 
+            if conf.env['CXX_NAME'] in ['gcc']:
+                if tuple(map(int, conf.env['CC_VERSION'])) >= gcc_version_gtkplus_warning_issue:
+                    conf.env.append_value('CXXFLAGS', '-Wno-parentheses')
+
     have_libxml2 = conf.check_cfg(package='libxml-2.0', atleast_version='2.7',
                                   args=['--cflags', '--libs'], uselib_store='LIBXML2',
                                   mandatory=False)