--- a/mobile/android/base/FennecManifest_permissions.xml.in
+++ b/mobile/android/base/FennecManifest_permissions.xml.in
@@ -5,16 +5,22 @@
      they can be easily shared between the two APKs. -->
 
 #include ../services/manifests/FxAccountAndroidManifest_permissions.xml.in
 
 #ifdef MOZ_ANDROID_SEARCH_ACTIVITY
 #include ../search/manifests/SearchAndroidManifest_permissions.xml.in
 #endif
 
+#ifdef MOZ_ANDROID_GCM
+#ifdef NIGHTLY_BUILD
+#include GcmAndroidManifest_permissions.xml.in
+#endif
+#endif
+
     <!-- A signature level permission specific to each Firefox version (Android
          package name, e.g., org.mozilla.firefox).  Use this permission to
          broadcast securely within a single Firefox version.  This needs to
          agree with GlobalConstants.PER_ANDROID_PACKAGE_PERMISSION. -->
     <permission
         android:name="@ANDROID_PACKAGE_NAME@.permission.PER_ANDROID_PACKAGE"
         android:protectionLevel="signature"/>
 

new file mode 100644
--- /dev/null
+++ b/mobile/android/base/GcmAndroidManifest_permissions.xml.in
@@ -0,0 +1,4 @@
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+    <!-- Avoid a linter warning by not double-including WAKE_LOCK.
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    -->