diff --git a/build.gradle b/build.gradle
index 7fbd598a..635996ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright 2013-2016 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,22 @@
  * limitations under the License.
  */
 
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
+    }
+}
+
+allprojects {
+    apply plugin: 'idea'
+    ext.androidBuildVersionTools = "23.0.3"
+}
+
+def androidCompileSdk() { return 23 }
 
 subprojects {
     group = 'org.microg'
diff --git a/extern/GmsApi b/extern/GmsApi
index b9cb95d3..c6f5d258 160000
--- a/extern/GmsApi
+++ b/extern/GmsApi
@@ -1 +1 @@
-Subproject commit b9cb95d39bdb4bbac6dd0d2b0405e4d5a23717c2
+Subproject commit c6f5d25850d86a78119c0175678c81178b0500e1
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 90babf29..2b30f04c 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/play-services-base/build.gradle b/play-services-base/build.gradle
index a2d4f921..83a0d2c3 100644
--- a/play-services-base/build.gradle
+++ b/play-services-base/build.gradle
@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion androidCompileSdk()
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()
diff --git a/play-services-cast/build.gradle b/play-services-cast/build.gradle
index a407e8b6..88b18fc3 100644
--- a/play-services-cast/build.gradle
+++ b/play-services-cast/build.gradle
@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion androidCompileSdk()
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()
diff --git a/play-services-gcm/build.gradle b/play-services-gcm/build.gradle
index c9b0c102..64aaf2db 100644
--- a/play-services-gcm/build.gradle
+++ b/play-services-gcm/build.gradle
@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion androidCompileSdk()
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()
diff --git a/play-services-iid/build.gradle b/play-services-iid/build.gradle
index d3d6661c..4975b16e 100644
--- a/play-services-iid/build.gradle
+++ b/play-services-iid/build.gradle
@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion androidCompileSdk()
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()
diff --git a/play-services-location/build.gradle b/play-services-location/build.gradle
index 4a211cf9..1ba77d1a 100644
--- a/play-services-location/build.gradle
+++ b/play-services-location/build.gradle
@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion androidCompileSdk()
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()
diff --git a/play-services-tasks/build.gradle b/play-services-tasks/build.gradle
index d80b1829..0dc4acc2 100644
--- a/play-services-tasks/build.gradle
+++ b/play-services-tasks/build.gradle
@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion androidCompileSdk()
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()
diff --git a/play-services-wearable/build.gradle b/play-services-wearable/build.gradle
index d5ad389a..249b5b1b 100644
--- a/play-services-wearable/build.gradle
+++ b/play-services-wearable/build.gradle
@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion androidCompileSdk()
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()
diff --git a/play-services/build.gradle b/play-services/build.gradle
index 323f81c6..c1a7d6dd 100644
--- a/play-services/build.gradle
+++ b/play-services/build.gradle
@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion androidCompileSdk()
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()