diff --git a/src/docker/fedora21/Dockerfile b/src/docker/fedora21/Dockerfile
index 2845cb5..3274020 100644
--- a/src/docker/fedora21/Dockerfile
+++ b/src/docker/fedora21/Dockerfile
@@ -49,9 +49,9 @@
 WORKDIR /home/mozc_builder/work
 
 ## Android SDK/NDK
-RUN curl -L http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin -O && chmod u+x android-ndk-r10d-linux-x86_64.bin && ./android-ndk-r10d-linux-x86_64.bin && rm android-ndk-r10d-linux-x86_64.bin
+RUN curl -L http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin -O && chmod u+x android-ndk-r10e-linux-x86_64.bin && ./android-ndk-r10e-linux-x86_64.bin && rm android-ndk-r10e-linux-x86_64.bin
 RUN curl -L http://dl.google.com/android/android-sdk_r24.1.2-linux.tgz | tar -zx
-ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r10d
+ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r10e
 ENV ANDROID_HOME /home/mozc_builder/work/android-sdk-linux
 ENV PATH $PATH:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_NDK_HOME}
 RUN echo y | android update sdk --all --force --no-ui --filter android-22
diff --git a/src/docker/ubuntu14.04/Dockerfile b/src/docker/ubuntu14.04/Dockerfile
index b5221f1..34cb954 100644
--- a/src/docker/ubuntu14.04/Dockerfile
+++ b/src/docker/ubuntu14.04/Dockerfile
@@ -54,9 +54,9 @@
 WORKDIR /home/mozc_builder/work
 
 ## Android SDK/NDK
-RUN curl -L http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin -O && chmod u+x android-ndk-r10d-linux-x86_64.bin && ./android-ndk-r10d-linux-x86_64.bin && rm android-ndk-r10d-linux-x86_64.bin
+RUN curl -L http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin -O && chmod u+x android-ndk-r10e-linux-x86_64.bin && ./android-ndk-r10e-linux-x86_64.bin && rm android-ndk-r10e-linux-x86_64.bin
 RUN curl -L http://dl.google.com/android/android-sdk_r24.1.2-linux.tgz | tar -zx
-ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r10d
+ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r10e
 ENV ANDROID_HOME /home/mozc_builder/work/android-sdk-linux
 ENV PATH $PATH:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_NDK_HOME}
 RUN echo y | android update sdk --all --force --no-ui --filter android-22
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 04df924..1160a21 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2095
+BUILD=2096
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.