diff --git a/ibus-m17n-fix-mtext-config.patch b/ibus-m17n-fix-mtext-config.patch
new file mode 100644
index 0000000..4e29a8f
--- /dev/null
+++ b/ibus-m17n-fix-mtext-config.patch
@@ -0,0 +1,25 @@
+From 9897c12c22619a7cc2a78e81df344c325c690a9e Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@unixuser.org>
+Date: Thu, 2 Aug 2012 17:55:07 +0900
+Subject: [PATCH] setup: fix storing MText values
+
+---
+ src/setup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/setup.c b/src/setup.c
+index cc5cb09..aa109bf 100644
+--- a/src/setup.c
++++ b/src/setup.c
+@@ -73,7 +73,7 @@ parse_m17n_value (MPlist *plist, gchar *text)
+     if (mplist_key (plist) == Mtext) {
+         MText *mtext;
+ 
+-        mtext = mtext_from_data (text, strlen (text), MTEXT_FORMAT_UTF_8);
++        mtext = mconv_decode_buffer (Mcoding_utf_8, text, strlen (text));
+         value = mplist ();
+         mplist_add (value, Mtext, mtext);
+         return value;
+-- 
+1.7.11.2
+
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index f80a460..7e0cfa1 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -19,7 +19,7 @@
 
 Name:       ibus-m17n
 Version:    1.3.4
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -31,6 +31,7 @@ Patch1:     ibus-m17n-xkb-options.patch
 Patch2:	    ibus-m17n-hide-title-status.patch
 Patch3:	    ibus-m17n-blacklist-engines.patch
 Patch4:	    ibus-m17n-virtkbd.patch
+Patch5:	    ibus-m17n-fix-mtext-config.patch
 
 # The following BR is for autogen and not necessary when packging
 # released tarballs.
@@ -64,6 +65,7 @@ the input table maps from m17n-db.
 %patch2 -p1 -b .hide-title-status
 %patch3 -p1 -b .blacklist-engines
 %patch4 -p1 -b .virtkbd
+%patch5 -p1 -b .fix-mtext-config
 
 NOCONFIGURE=1 ./autogen.sh
 
@@ -85,6 +87,11 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 %{_datadir}/ibus/component/*
 
 %changelog
+* Thu Aug  2 2012 Daiki Ueno <dueno@redhat.com> - 1.3.4-3
+- Add ibus-m17n-fix-mtext-config.patch
+- Fix bug 836397 - [abrt] ibus-m17n-1.3.3-11.fc17: mtext_data: Process
+  /usr/libexec/ibus-setup-m17n was killed by signal 11 (SIGSEGV)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild