diff --git a/BUILDING.md b/BUILDING.md
index 0d4ac25aa6..8a60bf59c4 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -6,3 +6,17 @@ Building TextSecure
 Execute Gradle:
 
     ./gradlew build
+
+Re-building native components
+-----------------------------
+
+Note: This step is optional; native components are contained as binaries (see [library/libs](library/libs)).
+
+1. Ensure that the Android NDK is installed.
+
+Execute ndk-build:
+
+    cd library
+    ndk-build
+
+Afterwards, execute Gradle as above to re-create the APK.
diff --git a/build.gradle b/build.gradle
index 22f9548605..6f88828860 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ dependencies {
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '19.0.0'
+    buildToolsVersion '19.0.2'
 
     defaultConfig {
         minSdkVersion 9
@@ -42,7 +42,7 @@ android {
                 manifest.srcFile 'AndroidManifest.xml'
                 java.srcDirs = ['src']
                 resources.srcDirs = ['src']
-                aild.srcDirs = ['src']
+                aidl.srcDirs = ['src']
                 renderscript.srcDirs = ['src']
                 res.srcDirs = ['res']
                 assets.srcDirs = ['assets']
diff --git a/library/build.gradle b/library/build.gradle
index 890c700287..a9a2d497af 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -23,12 +23,11 @@ dependencies {
     compile 'com.madgag:sc-light-jdk15on:1.47.0.2'
     compile 'com.googlecode.libphonenumber:libphonenumber:5.3'
     compile 'org.whispersystems:gson:2.2.4'
-    compile fileTree(dir: 'libs', include: 'armeabi.jar')
 }
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '19.0.0'
+    buildToolsVersion '19.0.2'
 
     android {
         sourceSets {
@@ -36,10 +35,11 @@ android {
                 manifest.srcFile 'AndroidManifest.xml'
                 java.srcDirs = ['src']
                 resources.srcDirs = ['src']
-                aild.srcDirs = ['src']
+                aidl.srcDirs = ['src']
                 renderscript.srcDirs = ['src']
                 res.srcDirs = ['res']
                 assets.srcDirs = ['assets']
+                jniLibs.srcDirs = ['libs']
             }
         }
     }
diff --git a/library/jni/Application.mk b/library/jni/Application.mk
new file mode 100644
index 0000000000..7866257b9d
--- /dev/null
+++ b/library/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := armeabi armeabi-v7a x86
diff --git a/library/libs/armeabi.jar b/library/libs/armeabi.jar
deleted file mode 100644
index b34bd1237c..0000000000
Binary files a/library/libs/armeabi.jar and /dev/null differ