diff --git a/FDroidPrivilegedExtension/Android.mk b/FDroidPrivilegedExtension/Android.mk
index fd99f5cb8541ba1746edb8192b25788c2178f538..a0b0655d963d2dafb6d157e81f2be28df3e5b389 100644
--- a/FDroidPrivilegedExtension/Android.mk
+++ b/FDroidPrivilegedExtension/Android.mk
@@ -1,4 +1,13 @@
 LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := privapp-permissions-org.fdroid.fdroid.privileged.xml
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := FDroidPrivilegedExtension
@@ -7,4 +16,6 @@ LOCAL_MODULE_CLASS := APPS
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_REQUIRED_MODULES := privapp-permissions-org.fdroid.fdroid.privileged.xml
 include $(BUILD_PREBUILT)
+
diff --git a/FDroidPrivilegedExtension/privapp-permissions-org.fdroid.fdroid.privileged.xml b/FDroidPrivilegedExtension/privapp-permissions-org.fdroid.fdroid.privileged.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3a7d4426c49310cff2e2af7fae7ad4ec02aac1fd
--- /dev/null
+++ b/FDroidPrivilegedExtension/privapp-permissions-org.fdroid.fdroid.privileged.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <privapp-permissions package="org.fdroid.fdroid.privileged">
+        <permission name="android.permission.DELETE_PACKAGES"/>
+        <permission name="android.permission.INSTALL_PACKAGES"/>
+    </privapp-permissions>
+</permissions>
diff --git a/FakeStore/Android.mk b/FakeStore/Android.mk
index 670cc07ba52cecdbbe7a06171f385b39d9c60010..7aaaf18799a2a4c0ca996cef835f730c9e155980 100644
--- a/FakeStore/Android.mk
+++ b/FakeStore/Android.mk
@@ -1,4 +1,13 @@
 LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := privapp-permissions-com.android.vending.xml
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := FakeStore
@@ -7,4 +16,6 @@ LOCAL_MODULE_CLASS := APPS
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_REQUIRED_MODULES := privapp-permissions-com.android.vending.xml
 include $(BUILD_PREBUILT)
+
diff --git a/FakeStore/privapp-permissions-com.android.vending.xml b/FakeStore/privapp-permissions-com.android.vending.xml
new file mode 100644
index 0000000000000000000000000000000000000000..82f0402b92b0d4b3923e190ac8de2e0591ee72fd
--- /dev/null
+++ b/FakeStore/privapp-permissions-com.android.vending.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <privapp-permissions package="com.android.vending">
+        <permission name="android.permission.FAKE_PACKAGE_SIGNATURE"/>
+    </privapp-permissions>
+</permissions>
diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk
index 63fbbd6a93b3082f3c64e24e86755215c81c4da1..6c36ba9d66c2e3edbae54bf580beddb6ae7e0a35 100644
--- a/GmsCore/Android.mk
+++ b/GmsCore/Android.mk
@@ -1,4 +1,13 @@
 LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := privapp-permissions-com.google.android.gms.xml
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := GmsCore
@@ -8,4 +17,6 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_OVERRIDES_PACKAGES := com.qualcomm.location
+LOCAL_REQUIRED_MODULES := privapp-permissions-com.google.android.gms.xml
 include $(BUILD_PREBUILT)
+
diff --git a/GmsCore/privapp-permissions-com.google.android.gms.xml b/GmsCore/privapp-permissions-com.google.android.gms.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f6845d177180178b48b6c60103233411527d6a07
--- /dev/null
+++ b/GmsCore/privapp-permissions-com.google.android.gms.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <privapp-permissions package="com.google.android.gms">
+        <permission name="android.permission.FAKE_PACKAGE_SIGNATURE"/>
+        <permission name="android.permission.INSTALL_LOCATION_PROVIDER"/>
+    </privapp-permissions>
+</permissions>
diff --git a/com.google.android.maps/Android.mk b/com.google.android.maps/Android.mk
index 65b16ec17b6072a85050bde21b5f037663a4bb6a..448dd30b8de933f26975c11d004c2eb59ac369b1 100644
--- a/com.google.android.maps/Android.mk
+++ b/com.google.android.maps/Android.mk
@@ -1,5 +1,13 @@
 LOCAL_PATH := $(call my-dir)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := com.google.android.maps.xml
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
+LOCAL_SRC_FILES := com.google.android.maps.xml
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := com.google.android.maps.jar
 LOCAL_MODULE_TAGS := optional
@@ -10,10 +18,3 @@ LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_REQUIRED_MODULES := com.google.android.maps.xml
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.google.android.maps.xml
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
-LOCAL_SRC_FILES := com.google.android.maps.xml
-include $(BUILD_PREBUILT)