diff --git a/.gitignore b/.gitignore
index 3d33549..7131695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@ ibus-1.3.6.tar.gz
 /ibus-1.3.99.20110408.tar.gz
 /ibus-1.3.99.20110419.tar.gz
 /ibus_master_da.po
-/ibus-gjs-1.3.99.20110818.tar.gz
+/ibus-gjs-3.0.2.20110823.tar.gz
+/ibus-gjs-3.1.4.20110823.tar.gz
diff --git a/ibus-xx-bridge-hotkey.patch b/ibus-xx-bridge-hotkey.patch
index 5a3f9f9..a204596 100644
--- a/ibus-xx-bridge-hotkey.patch
+++ b/ibus-xx-bridge-hotkey.patch
@@ -1013,6 +1013,26 @@ index 8979515..2a2b459
        <locale name="C">
          <short>Trigger shortcut keys</short>
  	    <long>The shortcut keys for turning input method on or off</long>
+@@ -103,6 +103,19 @@
+       </locale>
+     </schema>
+     <schema>
++      <key>/schemas/desktop/ibus/general/hotkey/use_bridge_hotkey</key>
++      <applyto>/desktop/ibus/general/hotkey/use_bridge_hotkey</applyto>
++      <owner>ibus</owner>
++      <type>bool</type>
++      <default>true</default>
++      <locale name="C">
++        <short>Use bridge hotkey</short>
++	    <long>Use trigger keys to toggle the prev and next IM engines
++                  if true. Use trigger keys to toggle an enable and 
++                  disabled IM engine if false.</long>
++      </locale>
++    </schema>
++    <schema>
+       <key>/schemas/desktop/ibus/panel/show</key>
+       <applyto>/desktop/ibus/panel/show</applyto>
+       <owner>ibus</owner>
 diff --git a/ibus/_config.py.in b/ibus/_config.py.in
 index a830136..4c3c980 100644
 --- a/ibus/_config.py.in
diff --git a/ibus.spec b/ibus.spec
index 0959ffd..a6dd598 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -7,8 +7,10 @@
 
 %if 0%{?fedora} > 15
 %define have_bridge_hotkey 1
+%define ibus_gjs_version 3.1.4.20110823
 %else
 %define have_bridge_hotkey 0
+%define ibus_gjs_version 3.0.2.20110823
 %endif
 
 %define ibus_api_version 1.0
@@ -20,7 +22,7 @@
 
 Name:       ibus
 Version:    1.3.99.20110419
-Release:    17%{?dist}
+Release:    18%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -28,7 +30,7 @@ URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
 %if %have_gjsfile
-Source2:    http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-gjs-1.3.99.20110818.tar.gz
+Source2:    http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-gjs-%{ibus_gjs_version}.tar.gz
 %endif
 Source3:    https://www.transifex.net/projects/p/ibus/resource/master/l/da/download/ibus_master_da.po
 Patch0:     ibus-HEAD.patch
@@ -369,7 +371,7 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Fri Aug 19 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110419-17
+* Tue Aug 23 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110419-18
 - Updated ibus-HEAD.patch for upstream.
 - Removed ibus-435880-surrounding-text.patch as upstream.
 - Added ibus-711632-fedora-fallback-icon.patch
diff --git a/sources b/sources
index 37e6fc1..4d85974 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 d4f2729fecb92ae6b41f26c770b1a772  ibus-1.3.99.20110419.tar.gz
-f55b2947b65ce16e2281608ccf58dbe1  ibus-gjs-1.3.99.20110818.tar.gz
+c4df79742fb0de4d2794c6800a493d20  ibus-gjs-3.0.2.20110823.tar.gz
+e97be8e1d0b22531b5000d4a6349dbbe  ibus-gjs-3.1.4.20110823.tar.gz
 698c90edf0f037488e1aa969804e891f  ibus_master_da.po