diff --git a/extern/SafeParcel b/extern/SafeParcel
index 2408cfd..e5e1d5a 160000
--- a/extern/SafeParcel
+++ b/extern/SafeParcel
@@ -1 +1 @@
-Subproject commit 2408cfd92aae226fa9941579e9da462948f22e60
+Subproject commit e5e1d5adc22ff7be540da46ec5263cd370a894a4
diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle
index de3a469..486f0b1 100644
--- a/play-services-api/build.gradle
+++ b/play-services-api/build.gradle
@@ -4,14 +4,12 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
 apply plugin: 'com.android.library'
-apply from: 'gradle-mvn-push.gradle'
-
-group = 'org.microg'
-version = '1.0-SNAPSHOT'
+apply plugin: 'com.github.dcendents.android-maven'
 
 dependencies {
     compile project(':safe-parcel')