diff --git a/uim-fix-bufferoverflow.patch b/uim-fix-bufferoverflow.patch
new file mode 100644
index 0000000..eff6d6f
--- /dev/null
+++ b/uim-fix-bufferoverflow.patch
@@ -0,0 +1,12 @@
+diff -pruN uim-1.8.6.orig/uim/m17nlib.c uim-1.8.6/uim/m17nlib.c
+--- uim-1.8.6.orig/uim/m17nlib.c	2013-06-30 13:26:09.000000000 +0900
++++ uim-1.8.6/uim/m17nlib.c	2018-02-27 20:01:51.098951178 +0900
+@@ -232,7 +232,7 @@ static char *
+ convert_mtext2str(MText *mtext)
+ {
+   mconv_rebind_buffer(converter, (unsigned char *)buffer_for_converter,
+-		      sizeof(buffer_for_converter));
++		      sizeof(buffer_for_converter)-1);
+   mconv_encode(converter, mtext);
+   buffer_for_converter[converter->nbytes] = 0;
+ 
diff --git a/uim.spec b/uim.spec
index b189eed..f1ef326 100644
--- a/uim.spec
+++ b/uim.spec
@@ -3,7 +3,7 @@
 
 Name:		uim
 Version:	1.8.6
-Release:	16%{?dist}
+Release:	17%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -20,11 +20,13 @@ BuildRequires:	libedit-devel libcurl-devel sqlite-devel expat-devel
 BuildRequires:	m17n-lib-devel m17n-db-devel
 BuildRequires:	m17n-db m17n-db-extras
 BuildRequires:	emacs libtool automake autoconf intltool xemacs
+BuildRequires:	gcc gcc-c++
 Source0:	http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:	xinput.d-uim
 Source2:	uim-init.el
 Patch1:		uim-emacs-utf8.patch
 Patch2:		uim-enable-libgcroots.patch
+Patch3:		uim-fix-bufferoverflow.patch
 
 
 Summary:	A multilingual input method library
@@ -179,9 +181,7 @@ many languages using the input table map from m17n-db.
 
 
 %prep
-%setup -q
-%patch1 -p1 -b .1-emacs
-%patch2 -p1 -b .2-libgcroots
+%autosetup -p1
 autoconf
 
 
@@ -365,7 +365,7 @@ fi
 %{_libdir}/uim/plugin/libuim-fileio.so
 %{_libdir}/uim/plugin/libuim-lolevel.so
 %{_libdir}/uim/plugin/libuim-look.so
-%{_libdir}/uim/plugin/libuim-openssl.so
+# %%{_libdir}/uim/plugin/libuim-openssl.so
 %{_libdir}/uim/plugin/libuim-process.so
 %{_libdir}/uim/plugin/libuim-socket.so
 %{_libdir}/uim/plugin/libuim-sqlite3.so
@@ -474,6 +474,10 @@ fi
 %dir %{_datadir}/uim
 
 %changelog
+* Tue Feb 27 2018 Akira TAGOH <tagoh@redhat.com> - 1.8.6-17
+- Add BR: gcc gcc-c++
+- Fix the buffer overflow. (#1549478)
+
 * Wed Feb 14 2018 Akira TAGOH <tagoh@redhat.com> - 1.8.6-16
 - Fix the build fail.
 - Disable uim-kde sub-package.