diff --git a/ibus-anthy-HEAD.patch b/ibus-anthy-HEAD.patch
index 8b13789..118db71 100644
--- a/ibus-anthy-HEAD.patch
+++ b/ibus-anthy-HEAD.patch
@@ -1 +1,345 @@
+From 7bfd04659a1c69f4cea65178b13e2d2b80f165bf Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Wed, 24 Sep 2014 15:43:45 +0900
+Subject: [PATCH] Fixed typo in emoji.t
+
+---
+ data/emoji.t | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/data/emoji.t b/data/emoji.t
+index 28606ec..961955f 100644
+--- a/data/emoji.t
++++ b/data/emoji.t
+@@ -241,7 +241,7 @@
+ えもじ #T35*500 🌤
+ えもじ #T35*500 ⛈
+ えもじ #T35*500 🌧
+-えもじ #T35*500 🌴 
++えもじ #T35*500 🌴
+ えもじ #T35*500 🌶
+ えもじ #T35*500 ⚘
+ えもじ #T35*500 ✿
+@@ -252,7 +252,7 @@
+ えもじ #T35*500 🌺
+ えもじ #T35*500 🌻
+ えもじ #T35*500 🌼
+-えもじ #T35*500 💮 
++えもじ #T35*500 💮
+ えもじ #T35*500 ☘
+ えもじ #T35*500 🍀
+ えもじ #T35*500 🍁
+@@ -935,7 +935,7 @@
+ がっかり #T35*500 🙍
+ がっかり #T35*500 🙎
+ がっこう #T35*500 🏫
+-き #T35*500 🌴 
++き #T35*500 🌴
+ きかざる #T35*500 🙉
+ きす #T35*500 💋
+ きす #T35*500 💏
+@@ -1420,7 +1420,7 @@
+ はな #T35*500 🌺
+ はな #T35*500 🌻
+ はな #T35*500 🌼
+-はな #T35*500 💮 
++はな #T35*500 💮
+ はな #T35*500 👃
+ はむすたー #T35*500 🐹
+ はれ #T35*500 ☼
+@@ -1485,7 +1485,7 @@
+ ひょう #T35*500 🐆
+ ひらめき #T35*500 💡
+ びきに #T35*500 👙
+-びっくり  #T35*500 😮
++びっくり #T35*500 😮
+ びっくり #T35*500 😰
+ びっくり #T35*500 😲
+ びでお #T35*500 📹
+@@ -1541,7 +1541,7 @@
+ へいじょううんてん #T35*500 😯
+ へいじょううんてん #T35*500 😶
+ へっどほん #T35*500 🎧
+-へび  #T35*500 🐍
++へび #T35*500 🐍
+ べる #T35*500 🔔
+ べる #T35*500 🕭
+ べろ #T35*500 😛
+@@ -1637,7 +1637,7 @@
+ やけい #T35*500 🌉
+ やさい #T35*500 🍅
+ やさい #T35*500 🍆
+-やしのき #T35*500 🌴 
++やしのき #T35*500 🌴
+ やま #T35*500 ⛰
+ ゆき #T35*500 ⛄
+ ゆき #T35*500 ⛇
+-- 
+1.8.5.3
+
+From a3c5187942eda25aee37bb6ed71347abdbe70da2 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Wed, 8 Oct 2014 15:39:51 +0900
+Subject: [PATCH] Fixed no parent when click on shortcut keys.
+
+---
+ setup/python2/main.py | 4 ++--
+ setup/python3/main.py | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/setup/python2/main.py b/setup/python2/main.py
+index e649a36..458cbf8 100644
+--- a/setup/python2/main.py
++++ b/setup/python2/main.py
+@@ -1706,14 +1706,14 @@ class AnthySetup(object):
+ 
+     def on_shortcut_key_release_event(self, widget, event):
+         if event.hardware_keycode in [36, 65]:
+-            self.on_btn_edit_clicked(None)
++            self.on_btn_edit_clicked(widget)
+ 
+     def on_shortcut_click_event(self, widget, event):
+         if event.type == Gdk.EventType._2BUTTON_PRESS:
+             widget.dc = True
+         elif event.type == Gdk.EventType.BUTTON_RELEASE:
+             if hasattr(widget, 'dc') and widget.dc:
+-                self.on_btn_edit_clicked(None)
++                self.on_btn_edit_clicked(widget)
+                 widget.dc = False
+ 
+     def on_key_input_dialog_key_press_event(self, widget, event):
+diff --git a/setup/python3/main.py b/setup/python3/main.py
+index 01080ae..5c74c83 100644
+--- a/setup/python3/main.py
++++ b/setup/python3/main.py
+@@ -1700,14 +1700,14 @@ class AnthySetup(object):
+ 
+     def on_shortcut_key_release_event(self, widget, event):
+         if event.hardware_keycode in [36, 65]:
+-            self.on_btn_edit_clicked(None)
++            self.on_btn_edit_clicked(widget)
+ 
+     def on_shortcut_click_event(self, widget, event):
+         if event.type == Gdk.EventType._2BUTTON_PRESS:
+             widget.dc = True
+         elif event.type == Gdk.EventType.BUTTON_RELEASE:
+             if hasattr(widget, 'dc') and widget.dc:
+-                self.on_btn_edit_clicked(None)
++                self.on_btn_edit_clicked(widget)
+                 widget.dc = False
+ 
+     def on_key_input_dialog_key_press_event(self, widget, event):
+-- 
+1.8.5.3
+
+From a9b880226fcc7a22ca84ed1947c047c6c53c8028 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Tue, 28 Oct 2014 15:42:41 +0900
+Subject: [PATCH] Updated emoji.t
+
+---
+ data/emoji.t | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 51 insertions(+)
+
+diff --git a/data/emoji.t b/data/emoji.t
+index 961955f..ce92a7f 100644
+--- a/data/emoji.t
++++ b/data/emoji.t
+@@ -156,6 +156,7 @@
+ えもじ #T35*500 ⚲
+ えもじ #T35*500 ⚽
+ えもじ #T35*500 ⚾
++えもじ #T35*500 ☃
+ えもじ #T35*500 ⛄
+ えもじ #T35*500 ⛇
+ えもじ #T35*500 ⛉
+@@ -191,12 +192,18 @@
+ えもじ #T35*500 ✐
+ えもじ #T35*500 ✑
+ えもじ #T35*500 ✒
++えもじ #T35*500 ⭐
++えもじ #T35*500 ⭑
++えもじ #T35*500 ⭒
+ えもじ #T35*500 ✦
+ えもじ #T35*500 ✧
+ えもじ #T35*500 ✨
+ えもじ #T35*500 ✩
+ えもじ #T35*500 ✪
+ えもじ #T35*500 ✫
++えもじ #T35*500 ⭐
++えもじ #T35*500 ⭑
++えもじ #T35*500 ⭒
+ えもじ #T35*500 ✬
+ えもじ #T35*500 ✭
+ えもじ #T35*500 ✮
+@@ -235,8 +242,10 @@
+ えもじ #T35*500 ⚝
+ えもじ #T35*500 🌟
+ えもじ #T35*500 🌠
++えもじ #T35*500 ☀
+ えもじ #T35*500 ☼
+ えもじ #T35*500 🌣
++えもじ #T35*500 ☁
+ えもじ #T35*500 ⛅
+ えもじ #T35*500 🌤
+ えもじ #T35*500 ⛈
+@@ -435,6 +444,17 @@
+ えもじ #T35*500 👃
+ えもじ #T35*500 👄
+ えもじ #T35*500 👅
++えもじ #T35*500 👆
++えもじ #T35*500 👇
++えもじ #T35*500 👈
++えもじ #T35*500 👉
++えもじ #T35*500 👊
++えもじ #T35*500 👋
++えもじ #T35*500 👌
++えもじ #T35*500 👍
++えもじ #T35*500 👎
++えもじ #T35*500 👏
++えもじ #T35*500 👐
+ えもじ #T35*500 ♔
+ えもじ #T35*500 ♕
+ えもじ #T35*500 ♚
+@@ -709,6 +729,8 @@
+ おにぎり #T35*500 🍙
+ おひつじざ #T35*500 ♉
+ おふぃす #T35*500 🏢
++おやゆび #T35*500 👍
++おやゆび #T35*500 👎
+ おんな #T35*500 👧
+ おんな #T35*500 👭
+ おんな #T35*500 👩
+@@ -716,6 +738,7 @@
+ おんぷ #T35*500 🎵
+ おんぷ #T35*500 🎶
+ おーけー #T35*500 🙆
++おーけー #T35*500 👌
+ かい #T35*500 🐚
+ かいおうせい #T35*500 ♆
+ かいわ #T35*500 ⚞
+@@ -902,6 +925,8 @@
+ かきごおり #T35*500 🍧
+ かく #T35*500 ✍
+ かくてる #T35*500 🍸
++かさ #T35*500 ☂
++かさ #T35*500 ☔
+ かさ #T35*500 🌂
+ かせい #T35*500 ♂
+ かぜ #T35*500 😷
+@@ -948,6 +973,9 @@
+ きもの #T35*500 👘
+ きょうかい #T35*500 ⛪
+ きょうふ #T35*500 😱
++きら #T35*500 ⭐
++きら #T35*500 ⭑
++きら #T35*500 ⭒
+ きら #T35*500 ✦
+ きら #T35*500 ✧
+ きら #T35*500 ✨
+@@ -998,6 +1026,7 @@
+ くつ #T35*500 👣
+ くっきー #T35*500 🍪
+ くま #T35*500 🐻
++くもり #T35*500 ☁
+ くもり #T35*500 ⛅
+ くもり #T35*500 🌤
+ くりすます #T35*500 🎄
+@@ -1070,6 +1099,7 @@
+ さそりざ #T35*500 ♏
+ さっかー #T35*500 ⚽
+ さっくす #T35*500 🎷
++さようなら #T35*500 👋
+ さる #T35*500 🐒
+ さる #T35*500 🐵
+ さんぱつ #T35*500 💇
+@@ -1194,6 +1224,7 @@
+ ぞう #T35*500 🐘
+ たいふう #T35*500 🌀
+ たいよう #T35*500 ☉
++たいよう #T35*500 ☀
+ たいよう #T35*500 ☼
+ たいよう #T35*500 🌣
+ たいよう #T35*500 🌞
+@@ -1255,6 +1286,7 @@
+ つかれる #T35*500 😫
+ てがき #T35*500 ✍
+ てにす #T35*500 🎾
++てのひら #T35*500 👐
+ てれび #T35*500 📺
+ てんとうむし #T35*500 🐞
+ てんのうせい #T35*500 ♅
+@@ -1399,6 +1431,7 @@
+ は #T35*500 🍄
+ はいひーる #T35*500 👠
+ はいびすかす #T35*500 🌺
++はくしゅ #T35*500 👏
+ はさみ #T35*500 ✀
+ はさみ #T35*500 ✁
+ はさみ #T35*500 ✂
+@@ -1423,6 +1456,7 @@
+ はな #T35*500 💮
+ はな #T35*500 👃
+ はむすたー #T35*500 🐹
++はれ #T35*500 ☀
+ はれ #T35*500 ☼
+ はれ #T35*500 🌣
+ はんげつ #T35*500 ◐
+@@ -1458,6 +1492,7 @@
+ はーと #T35*500 💟
+ ばいおりん #T35*500 🎻
+ ばいく #T35*500 🏍
++ばいばい #T35*500 👋
+ ばくだん #T35*500 💣
+ ばくはつ #T35*500 💥
+ ばすけっとぼーる #T35*500 🏀
+@@ -1471,12 +1506,17 @@
+ ぱらそる #T35*500 ⛱
+ ぱん #T35*500 🍞
+ ぱんだ #T35*500 🐼
++ぱんち #T35*500 👊
+ ぱー #T35*500 ✋
+ ひ #T35*500 🔥
+ ひこうき #T35*500 ✈
+ ひつぎ #T35*500 ⚰
+ ひつじ #T35*500 🐏
+ ひつじ #T35*500 🐑
++ひとさしゆび #T35*500 👆
++ひとさしゆび #T35*500 👇
++ひとさしゆび #T35*500 👈
++ひとさしゆび #T35*500 👉
+ ひのいり #T35*500 🌇
+ ひので #T35*500 🌄
+ ひので #T35*500 🌅
+@@ -1555,6 +1595,9 @@
+ ぺん #T35*500 ✒
+ ぺんぎん #T35*500 🐧
+ ほうちょう #T35*500 🔪
++ほし #T35*500 ⭐
++ほし #T35*500 ⭑
++ほし #T35*500 ⭒
+ ほし #T35*500 ✦
+ ほし #T35*500 ✧
+ ほし #T35*500 ✨
+@@ -1639,10 +1682,18 @@
+ やさい #T35*500 🍆
+ やしのき #T35*500 🌴
+ やま #T35*500 ⛰
++ゆき #T35*500 ☃
+ ゆき #T35*500 ⛄
+ ゆき #T35*500 ⛇
++ゆきだるま #T35*500 ☃
+ ゆきだるま #T35*500 ⛄
+ ゆきだるま #T35*500 ⛇
++ゆび #T35*500 👆
++ゆび #T35*500 👇
++ゆび #T35*500 👈
++ゆび #T35*500 👉
++ゆび #T35*500 👍
++ゆび #T35*500 👎
+ よぞら #T35*500 🌃
+ らっと #T35*500 🐀
+ らくだ #T35*500 🐪
+-- 
+1.8.5.3
 
diff --git a/ibus-anthy.spec b/ibus-anthy.spec
index c95a1fe..77c090e 100644
--- a/ibus-anthy.spec
+++ b/ibus-anthy.spec
@@ -14,7 +14,7 @@
 
 Name:           ibus-anthy
 Version:        1.5.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Anthy engine for IBus input platform
 License:        GPLv2+
 Group:          System Environment/Libraries
@@ -23,6 +23,7 @@ Source0:        https://github.com/ibus/ibus-anthy/releases/download/%{version}/
 
 # Upstreamed patches.
 # Patch0:         %%{name}-HEAD.patch
+Patch0:         %{name}-HEAD.patch
 # Add an input mode icon until ibus-ui-gtk3 is fixed.
 Patch1:         %%{name}-xx-input-mode.patch
 
@@ -81,6 +82,7 @@ for developers.
 %prep
 %setup -q
 # %%patch0 -p1
+%patch0 -p1
 %patch1 -p1 -b .input-mode
 
 %build
@@ -157,6 +159,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_libdir}/libanthygobject-%{sub_version}.so
 
 %changelog
+* Tue Oct 28 2014 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.6-2
+- Updated ibus-anthy-HEAD.patch to fix Enter key on setup dialog.
+
 * Tue Sep 16 2014 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.6-1
 - Bumped to 1.5.6
 - Added ibus-anthy-xx-input-mode.patch from ibus-anthy-HEAD.patch.