diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle
index 5b5dd33e..9b97d190 100644
--- a/play-services-api/build.gradle
+++ b/play-services-api/build.gradle
@@ -53,6 +53,7 @@ android {
 dependencies {
     compile project(':play-services-cast-api')
     compile project(':play-services-common-api')
+    compile project(':play-services-iid-api')
     compile project(':play-services-location-api')
     compile project(':play-services-wearable-api')
 }
diff --git a/play-services-api/src/main/java/org/microg/gms/gcm/GcmConstants.java b/play-services-common-api/src/main/java/org/microg/gms/gcm/GcmConstants.java
similarity index 100%
rename from play-services-api/src/main/java/org/microg/gms/gcm/GcmConstants.java
rename to play-services-common-api/src/main/java/org/microg/gms/gcm/GcmConstants.java
diff --git a/play-services-iid-api/build.gradle b/play-services-iid-api/build.gradle
new file mode 100644
index 00000000..47f513a0
--- /dev/null
+++ b/play-services-iid-api/build.gradle
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2013-2015 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.2'
+    }
+}
+
+apply plugin: 'com.android.library'
+
+String getMyVersionName() {
+    def stdout = new ByteArrayOutputStream()
+    if (rootProject.file("gradlew").exists())
+        exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout }
+    else // automatic build system, don't tag dirty
+        exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout }
+    return stdout.toString().trim().substring(1)
+}
+
+group = 'org.microg'
+version = getMyVersionName()
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
+
+    defaultConfig {
+        versionName getMyVersionName()
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_6
+    }
+}
+
+dependencies {
+    compile project(':play-services-common-api')
+}
diff --git a/play-services-iid-api/src/main/AndroidManifest.xml b/play-services-iid-api/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..fa9ea1be
--- /dev/null
+++ b/play-services-iid-api/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2013-2015 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.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.microg.gms.iid.api">
+
+    <uses-sdk android:minSdkVersion="9" />
+
+    <application />
+</manifest>
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/iid/IMessengerCompat.aidl b/play-services-iid-api/src/main/aidl/com/google/android/gms/iid/IMessengerCompat.aidl
similarity index 100%
rename from play-services-api/src/main/aidl/com/google/android/gms/iid/IMessengerCompat.aidl
rename to play-services-iid-api/src/main/aidl/com/google/android/gms/iid/IMessengerCompat.aidl
diff --git a/play-services-api/src/main/java/com/google/android/gms/iid/MessengerCompat.java b/play-services-iid-api/src/main/java/com/google/android/gms/iid/MessengerCompat.java
similarity index 100%
rename from play-services-api/src/main/java/com/google/android/gms/iid/MessengerCompat.java
rename to play-services-iid-api/src/main/java/com/google/android/gms/iid/MessengerCompat.java
diff --git a/settings.gradle b/settings.gradle
index 7a2ffd82..b13b2661 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,7 @@
 include ':play-services-api'
 include ':play-services-cast-api'
 include ':play-services-common-api'
+include ':play-services-iid-api'
 include ':play-services-location-api'
 include ':play-services-wearable-api'
 include ':safe-parcel'