diff --git a/.vagrant/Vagrantfile b/.vagrant/Vagrantfile
index 41ef2df..3b59f65 100644
--- a/.vagrant/Vagrantfile
+++ b/.vagrant/Vagrantfile
@@ -8,8 +8,8 @@
 CRYSTAX_NDK_VERSION=10.3.1
 
 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
 
 sudo apt-get install -y build-essential git openjdk-7-jdk unzip
 sudo apt-get install -y lib32stdc++6 lib32z1 lib32z1-dev
diff --git a/README.md b/README.md
index 6a87d2b..0516d54 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@
 
 To compile code, the following is necessary
 
-- Recent version of [Android SDK](http://developer.android.com/sdk/index.html), android-21 SDK
-  and 21.1.2 build tools (for build), android-19 SDK (for compatibility), and several other SDK
+- Recent version of [Android SDK](http://developer.android.com/sdk/index.html), android-23 SDK
+  and 23.0.2 build tools (for build), android-19 SDK (for compatibility), and several other SDK
   components
 - [CrystalX Android NDK](https://www.crystax.net/en/download) version 10.3.1
 
@@ -17,14 +17,11 @@
     CRYSTAX_NDK_VERSION=10.3.1
     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
 
     sudo apt-get install -y build-essential git openjdk-7-jdk unzip
-
-    # SDK binaries need i386 libraries
-    sudo dpkg --add-architecture i386;
-    sudo apt-get update -qq; sudo apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 zlib1g:i386
+    sudo apt-get install -y lib32stdc++6 lib32z1 lib32z1-dev
 
     wget https://www.crystax.net/download/crystax-ndk-$CRYSTAX_NDK_VERSION-linux-x86_64.tar.xz
     tar xf crystax-ndk-$CRYSTAX_NDK_VERSION-linux-x86_64.tar.xz
diff --git a/app/build.gradle b/app/build.gradle
index a18648d..5c1b90b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,8 +3,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         applicationId "net.named_data.nfd"
@@ -135,8 +135,8 @@
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:21.0.3'
-    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:support-v4:23.1.1'
 
     compile('com.intel.jndn.management:jndn-management:1.1.0') {
       exclude group: 'net.named-data', module: 'jndn'