diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd5356df8..5d4c9d970 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,9 +13,9 @@ before_script:
   - export ANDROID_HOME=$PWD/android-sdk
   - export PATH="$ANDROID_HOME/tools:$PATH"
   - echo " == Installing Android SDK components"
-  - echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.1,android-22,extra-android-m2repository
+  - echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.2,android-22,extra-android-m2repository
   - export PATH="$ANDROID_HOME/platform-tools:$PATH"
-  - export PATH="$ANDROID_HOME/build-tools/23.0.1:$PATH"
+  - export PATH="$ANDROID_HOME/build-tools/23.0.2:$PATH"
   - echo " == Installing Android emulator images"
   - echo y | android -s update sdk --no-ui -a -t android-10
   - echo " == Installing Gradle"
diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle
index 8b72a9cdf..5319b6911 100644
--- a/F-Droid/build.gradle
+++ b/F-Droid/build.gradle
@@ -110,7 +110,7 @@ if (!hasProperty('sourceDeps')) {
 
 android {
     compileSdkVersion 22
-    buildToolsVersion '23.0.1'
+    buildToolsVersion '23.0.2'
 
     sourceSets {
         main {
diff --git a/Privileged-Extension/build.gradle b/Privileged-Extension/build.gradle
index 9b46548c8..030876770 100644
--- a/Privileged-Extension/build.gradle
+++ b/Privileged-Extension/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
 android {
     compileSdkVersion 22
-    buildToolsVersion '23.0.1'
+    buildToolsVersion '23.0.2'
 
     defaultConfig {
         minSdkVersion 8
diff --git a/extern/support-v4-preferencefragment/build.gradle b/extern/support-v4-preferencefragment/build.gradle
index 1b211ebd9..d0da67120 100644
--- a/extern/support-v4-preferencefragment/build.gradle
+++ b/extern/support-v4-preferencefragment/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '23.0.1'
+    buildToolsVersion '23.0.2'
 
     defaultConfig {
         minSdkVersion 7
diff --git a/privileged-api-lib/build.gradle b/privileged-api-lib/build.gradle
index 14fad217f..5eb41250f 100644
--- a/privileged-api-lib/build.gradle
+++ b/privileged-api-lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion '23.0.1'
+    buildToolsVersion '23.0.2'
 
     defaultConfig {
         minSdkVersion 8