diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index 789de40e9..6fa3ddb0f 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -202,16 +202,5 @@
       </intent-filter> 
     </receiver>
 
-    <receiver android:name="com.google.android.gcm.GCMBroadcastReceiver" 
-              android:permission="com.google.android.c2dm.permission.SEND" >
-      <intent-filter>
-        <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-        <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-        <category android:name="${APP_ID}" />
-      </intent-filter>
-    </receiver>
-
-    <service android:name=".GCMIntentService" />
-
   </application>
 </manifest>
diff --git a/xwords4/android/app/src/xw4/AndroidManifest.xml b/xwords4/android/app/src/xw4/AndroidManifest.xml
index d4935c9d1..aff0f77bc 100644
--- a/xwords4/android/app/src/xw4/AndroidManifest.xml
+++ b/xwords4/android/app/src/xw4/AndroidManifest.xml
@@ -10,4 +10,17 @@
   <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
 
+  <application>
+    <receiver android:name="com.google.android.gcm.GCMBroadcastReceiver" 
+              android:permission="com.google.android.c2dm.permission.SEND" >
+      <intent-filter>
+        <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+        <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+        <category android:name="${APP_ID}" />
+      </intent-filter>
+    </receiver>
+
+    <service android:name=".GCMIntentService" />
+  </application>
+
 </manifest>