diff --git a/.jenkins.d/10-get-sdk.sh b/.jenkins.d/10-get-sdk.sh
index 84d231d..d0810d9 100755
--- a/.jenkins.d/10-get-sdk.sh
+++ b/.jenkins.d/10-get-sdk.sh
@@ -3,8 +3,8 @@
 set -x
 
 SDK_VERSION=24.4.1
-BUILD_TOOLS_VERSION=21.1.2
-COMPILE_SDK_VERSION=21
+BUILD_TOOLS_VERSION=23.0.2
+COMPILE_SDK_VERSION=23
 
 SDK=android-sdk-linux
 
diff --git a/.travis.yml b/.travis.yml
index c89383a..08520ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,17 @@
     on_success: always
     on_failure: always
 env:
- - NDK_BUILD_ABI=arm64-v8a
- - NDK_BUILD_ABI=armeabi
- - NDK_BUILD_ABI=armeabi-v7a
- - NDK_BUILD_ABI=mips
- - NDK_BUILD_ABI=x86
- - NDK_BUILD_ABI=x86_64
+  global:
+    - TERM=dumb
+    - GRADLE_OPTS="-Xmx768m -Xms256m -Xss1m"
+    - NDK_BUILD_PARALLEL=1
+  matrix:
+    - NDK_BUILD_ABI=arm64-v8a
+    - NDK_BUILD_ABI=armeabi
+    - NDK_BUILD_ABI=armeabi-v7a
+    - NDK_BUILD_ABI=mips
+    - NDK_BUILD_ABI=x86
+    - NDK_BUILD_ABI=x86_64
 addons:
   apt:
     packages:
@@ -35,4 +40,4 @@
   - travis_retry .jenkins.d/10-get-ndk.sh
 script:
   - git submodule update --init --recursive
-  - GRADLE_OPTS="-Xmx768m -Xms256m -Xss1m" NDK_BUILD_PARALLEL=1 ./gradlew assembleDebug --console rich
+  - ./gradlew assembleDebug
diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
new file mode 100644
index 0000000..7c8bfac
--- /dev/null
+++ b/RELEASE_NOTES.rst
@@ -0,0 +1,29 @@
+NFD-Android version 0.2.1
+-------------------------
+
+Release date: TBD
+
+Updates
+~~~~~~~
+
+- NFD updated to version 0.4.0-3-g4100646
+- ndn-cxx updated to version 0.4.0-4-g6617e49
+- jndn updated to version 0.10
+- jndn-management updated to version 1.1.0
+
+Bug fixes
+~~~~~~~~~
+
+- Fix creation of routes for ndn:/ (Issue #3399)
+
+NFD-Android version 0.1
+-----------------------
+
+Release date: January 6, 2016
+
+Based on:
+
+- NFD version 0.3.4-16-g441ba21
+- ndn-cxx version 0.3.4-9-g80b68e1
+- jndn version 0.4
+- customized version of jndn-management
diff --git a/app/build.gradle b/app/build.gradle
index b37327a..374c9d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@
         applicationId "net.named_data.nfd"
         minSdkVersion 15
         targetSdkVersion 19
-        versionCode 3005
-        versionName "0.3.4"
+        versionCode 4001
+        versionName "0.2.1 (NFD 0.4.0-3-g4100646)"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7