diff --git a/common.gypi b/common.gypi
index 0a51eab96..03de1e212 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -541,6 +541,13 @@
         'clang_chrome_plugins_flags':
             '<!(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)',
       }],
+
+      # Set 1 to enable ibus support. Currently it is only supported in touchui.
+      ['touchui==1 and chromeos==1', {
+        'use_ibus%': 1,
+      }, {
+        'use_ibus%': 0,
+      }]
     ],
   },
   'target_defaults': {
diff --git a/linux/system.gyp b/linux/system.gyp
index a52083b9a..cbe519408 100644
--- a/linux/system.gyp
+++ b/linux/system.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -350,11 +350,9 @@
       'target_name': 'ibus',
       'type': 'settings',
       'conditions': [
-        ['"<!@(<(pkg-config) --atleast-version=1.3.99 ibus-1.0 || echo $?)"==""', {
-          'variables': {
-            'ibus': 1
-          },
+        ['use_ibus==1', {
           'direct_dependent_settings': {
+            'defines': ['HAVE_IBUS=1'],
             'cflags': [
               '<!@(<(pkg-config) --cflags ibus-1.0)',
             ],