diff --git a/.gitignore b/.gitignore
index 8233716..62d863c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,5 @@ clog
 /x-ken-all201312.zip
 /mozc-1.15.1814.102.tar.bz2
 /x-ken-all201405.zip
+/mozc-2.16.2068.102.tar.bz2
+/mozc-2.17.2077.102.tar.bz2
diff --git a/mozc-build-gcc.patch b/mozc-build-gcc.patch
new file mode 100644
index 0000000..8a677da
--- /dev/null
+++ b/mozc-build-gcc.patch
@@ -0,0 +1,26 @@
+diff -pruN mozc-2.16.2068.102.orig/gyp/common.gypi mozc-2.16.2068.102/gyp/common.gypi
+--- mozc-2.16.2068.102.orig/gyp/common.gypi	2015-03-02 17:26:27.000000000 +0900
++++ mozc-2.16.2068.102/gyp/common.gypi	2015-04-28 17:31:24.098718394 +0900
+@@ -161,9 +161,9 @@
+       ['target_platform=="Linux"', {
+         # enable_gtk_renderer represents if mozc_renderer is supported on Linux
+         # or not.
+-        'compiler_target': 'clang',
++        'compiler_target': 'gcc',
+         'compiler_target_version_int': 305,  # Clang 3.5 or higher
+-        'compiler_host': 'clang',
++        'compiler_host': 'gcc',
+         'compiler_host_version_int': 305,  # Clang 3.5 or higher
+         'enable_gtk_renderer%': 1,
+       }, {  # else
+@@ -865,8 +865,8 @@
+     ['target_platform=="Linux"', {
+       'make_global_settings': [
+         ['AR', '<!(which ar)'],
+-        ['CC', '<!(which clang)'],
+-        ['CXX', '<!(which clang++)'],
++        ['CC', '<!(which gcc)'],
++        ['CXX', '<!(which g++)'],
+         ['LD', '<!(which ld)'],
+         ['NM', '<!(which nm)'],
+         ['READELF', '<!(which readelf)'],
diff --git a/mozc-build-verbosely.patch b/mozc-build-verbosely.patch
index 7b68873..c4d6ecc 100644
--- a/mozc-build-verbosely.patch
+++ b/mozc-build-verbosely.patch
@@ -1,12 +1,12 @@
 diff -pruN mozc-2.16.2068.102.orig/build_mozc.py mozc-2.16.2068.102/build_mozc.py
 --- mozc-2.16.2068.102.orig/build_mozc.py	2015-03-02 17:26:43.000000000 +0900
-+++ mozc-2.16.2068.102/build_mozc.py	2015-03-02 18:21:06.055023986 +0900
-@@ -1022,7 +1022,7 @@ def BuildOnLinux(options, targets, unuse
-                                          GetMozcVersion().GetTargetPlatform())
-   make_command = ninja
-   build_args = ['-j %s' % options.jobs,
--                '-C', '%s/%s' % (short_basename, options.configuration)]
-+                '-C', '%s/%s' % (short_basename, options.configuration), 'V=1']
-   RunOrDie([make_command] + build_args + target_names)
++++ mozc-2.16.2068.102/build_mozc.py	2015-03-02 18:46:24.928023986 +0900
+@@ -1012,7 +1012,7 @@ def BuildOnLinux(options, targets, unuse
+         CanonicalTargetToGypFileAndTargetName(target))
+     target_names.append(target_name)
  
+-  ninja = 'ninja'
++  ninja = 'ninja-build'
  
+   if hasattr(options, 'android_device'):
+     # Only for android testing.
diff --git a/mozc.spec b/mozc.spec
index b0fe84c..9c711ad 100644
--- a/mozc.spec
+++ b/mozc.spec
@@ -1,8 +1,9 @@
 %define		pkg	mozc
+%undefine	_hardened_build
 
 Name:		mozc
-Version:	1.15.1814.102
-Release:	3%{?dist}
+Version:	2.17.2077.102
+Release:	1%{?dist}
 Summary:	A Japanese Input Method Editor (IME) designed for multi-platform
 
 Group:		System Environment/Libraries
@@ -36,16 +37,16 @@ URL:		http://code.google.com/p/mozc
 Source0:	%{name}-%{version}.tar.bz2
 Source1:	mozc-init.el
 # Public Domain
-#Source2:	http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip
-## http://zipcloud.ibsnet.co.jp/zipcodedata/download?di=1401436849936
-### Use the alternative modified zipcode data due to the original is broken to process in the machine.
-Source2:	x-ken-all201405.zip
+Source2:	http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip
 Source3:	http://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip
 Source4:	ibus-setup-mozc-jp.desktop
 Patch0:		mozc-build-verbosely.patch
+## to avoid undefined symbols with clang.
+Patch1:		mozc-build-gcc.patch
 
 BuildRequires:	python gettext
-BuildRequires:	libstdc++-devel zlib-devel libxcb-devel protobuf-devel glib2-devel qt-devel zinnia-devel gtk2-devel
+BuildRequires:	libstdc++-devel zlib-devel libxcb-devel protobuf-devel protobuf-c glib2-devel qt-devel zinnia-devel gtk2-devel
+BuildRequires:	clang ninja-build
 BuildRequires:	gyp >= 0.1-0.4.840svn
 BuildRequires:	ibus-devel >= 1.5.4
 BuildRequires:	emacs
@@ -139,13 +140,15 @@ to use mozc with XEmacs.
 %prep
 %setup -q -c -n %{name}-%{version} -a 2 -a 3
 %patch0 -p1 -b .0-build-verbosely
+%patch1 -p1 -b .1-gcc
 (cd data/dictionary_oss;
-python ../../dictionary/gen_zip_code_seed.py --zip_code=../../x-ken-all.csv --jigyosyo=../../JIGYOSYO.CSV >> dictionary09.txt;
+python ../../dictionary/gen_zip_code_seed.py --zip_code=../../KEN_ALL.CSV --jigyosyo=../../JIGYOSYO.CSV >> dictionary09.txt;
 )
 
 
 %build
-GYP_DEFINES="use_libprotobuf=1 zinnia_model_file=/usr/share/zinnia/model/tomoe/handwriting-ja.model ibus_mozc_path=%{_libexecdir}/ibus-engine-mozc ibus_mozc_icon_path=%{_datadir}/ibus-mozc/product_icon.png" python build_mozc.py gyp --gypdir=%{_bindir} --server_dir=%{_libexecdir}/mozc
+echo $RPM_OPT_FLAGS
+GYP_DEFINES="compiler_target=gcc use_libprotobuf=1 zinnia_model_file=/usr/share/zinnia/model/tomoe/handwriting-ja.model ibus_mozc_path=%{_libexecdir}/ibus-engine-mozc ibus_mozc_icon_path=%{_datadir}/ibus-mozc/product_icon.png" python build_mozc.py gyp --gypdir=%{_bindir} --server_dir=%{_libexecdir}/mozc
 python build_mozc.py build -c Release unix/ibus/ibus.gyp:ibus_mozc unix/emacs/emacs.gyp:mozc_emacs_helper server/server.gyp:mozc_server gui/gui.gyp:mozc_tool renderer/renderer.gyp:mozc_renderer
 
 
@@ -161,7 +164,7 @@ install -p -m0644 data/installer/credits_{en,ja}.html $RPM_BUILD_ROOT%{_libexecd
 install -d $RPM_BUILD_ROOT%{_datadir}/ibus/component
 install -d $RPM_BUILD_ROOT%{_datadir}/ibus-mozc
 install -p -m0755 out_linux/Release/ibus_mozc $RPM_BUILD_ROOT%{_libexecdir}/ibus-engine-mozc
-install -p -m0644 out_linux/Release/obj/gen/unix/ibus/mozc.xml $RPM_BUILD_ROOT%{_datadir}/ibus/component/
+install -p -m0644 out_linux/Release/gen/unix/ibus/mozc.xml $RPM_BUILD_ROOT%{_datadir}/ibus/component/
 (cd data/images/unix;
 install -p -m0644 ime_product_icon_opensource-32.png $RPM_BUILD_ROOT%{_datadir}/ibus-mozc/product_icon.png
 for i in ui-*.png; do
@@ -230,6 +233,12 @@ xemacs -batch -f batch-byte-compile $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{pkg}
 %{_xemacs_sitelispdir}/%{pkg}/*.el
 
 %changelog
+* Tue Apr 28 2015 Akira TAGOH <tagoh@redhat.com> - 2.17.2077.102-1
+- rebase to 2.17.2077.102.
+
+* Mon Mar  2 2015 Akira TAGOH <tagoh@redhat.com> - 2.16.2068.102-1
+- New upstream release.
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.15.1814.102-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 2eccbe3..04c0fcc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-787ccde1394360ab9c77eade180f4e89  x-ken-all201405.zip
-2f45d23ed60f759d6eafc7d3c94efafb  jigyosyo.zip
-07cefa16aef63fa3b325f1a5dfdfda3e  mozc-1.15.1814.102.tar.bz2
+1554869ca1ecc24b1147344e057bca2f  mozc-2.17.2077.102.tar.bz2