diff --git a/app/autodiscovery/providersxml/build.gradle b/app/autodiscovery/providersxml/build.gradle
index 1ec0a36c0..a82e1b4f1 100644
--- a/app/autodiscovery/providersxml/build.gradle
+++ b/app/autodiscovery/providersxml/build.gradle
@@ -21,6 +21,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.autodiscovery.providersxml'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 
diff --git a/app/autodiscovery/providersxml/src/main/AndroidManifest.xml b/app/autodiscovery/providersxml/src/main/AndroidManifest.xml
deleted file mode 100644
index d2b511002..000000000
--- a/app/autodiscovery/providersxml/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.fsck.k9.autodiscovery.providersxml" />
diff --git a/app/core/build.gradle b/app/core/build.gradle
index 447bcfca0..ed06e03ec 100644
--- a/app/core/build.gradle
+++ b/app/core/build.gradle
@@ -43,6 +43,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.core'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 
diff --git a/app/core/src/main/AndroidManifest.xml b/app/core/src/main/AndroidManifest.xml
index dca0147e8..60d884212 100644
--- a/app/core/src/main/AndroidManifest.xml
+++ b/app/core/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.fsck.k9.core">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
diff --git a/app/crypto-openpgp/build.gradle b/app/crypto-openpgp/build.gradle
index 1aa5537b5..31a1df211 100644
--- a/app/crypto-openpgp/build.gradle
+++ b/app/crypto-openpgp/build.gradle
@@ -9,6 +9,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.crypto.openpgp'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 
diff --git a/app/crypto-openpgp/src/main/AndroidManifest.xml b/app/crypto-openpgp/src/main/AndroidManifest.xml
deleted file mode 100644
index 2cdc574d9..000000000
--- a/app/crypto-openpgp/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.fsck.k9.crypto.openpgp" />
diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle
index eedcf9c58..846334f41 100644
--- a/app/k9mail/build.gradle
+++ b/app/k9mail/build.gradle
@@ -41,6 +41,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 
diff --git a/app/k9mail/src/main/AndroidManifest.xml b/app/k9mail/src/main/AndroidManifest.xml
index dbf6fb714..aa8b7bd31 100644
--- a/app/k9mail/src/main/AndroidManifest.xml
+++ b/app/k9mail/src/main/AndroidManifest.xml
@@ -2,8 +2,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="auto"
-    package="com.fsck.k9">
+    android:installLocation="auto">
 
     <uses-feature
         android:name="android.hardware.touchscreen"
diff --git a/app/storage/build.gradle b/app/storage/build.gradle
index d4db393c3..376e9e7f2 100644
--- a/app/storage/build.gradle
+++ b/app/storage/build.gradle
@@ -24,6 +24,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.storage'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 
diff --git a/app/storage/src/main/AndroidManifest.xml b/app/storage/src/main/AndroidManifest.xml
deleted file mode 100644
index 008427734..000000000
--- a/app/storage/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.fsck.k9.storage" />
diff --git a/app/testing/build.gradle b/app/testing/build.gradle
index 91d2eb8a2..c349f9ddf 100644
--- a/app/testing/build.gradle
+++ b/app/testing/build.gradle
@@ -12,6 +12,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.testing'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 
diff --git a/app/testing/src/main/AndroidManifest.xml b/app/testing/src/main/AndroidManifest.xml
deleted file mode 100644
index a7a5e0145..000000000
--- a/app/testing/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.fsck.k9.testing" />
diff --git a/app/ui/base/build.gradle b/app/ui/base/build.gradle
index 97dc1f2bd..410764844 100644
--- a/app/ui/base/build.gradle
+++ b/app/ui/base/build.gradle
@@ -18,6 +18,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.ui.base'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 
diff --git a/app/ui/base/src/main/AndroidManifest.xml b/app/ui/base/src/main/AndroidManifest.xml
index f69b1cd3c..495700ab6 100644
--- a/app/ui/base/src/main/AndroidManifest.xml
+++ b/app/ui/base/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.fsck.k9.ui.base">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
 
diff --git a/app/ui/legacy/build.gradle b/app/ui/legacy/build.gradle
index ed5187a19..1ab0abb2e 100644
--- a/app/ui/legacy/build.gradle
+++ b/app/ui/legacy/build.gradle
@@ -70,6 +70,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.ui'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 
diff --git a/app/ui/legacy/src/main/AndroidManifest.xml b/app/ui/legacy/src/main/AndroidManifest.xml
index e7fd74708..c44690f93 100644
--- a/app/ui/legacy/src/main/AndroidManifest.xml
+++ b/app/ui/legacy/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.fsck.k9.ui">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.VIBRATE" />
 
diff --git a/app/ui/setup/build.gradle b/app/ui/setup/build.gradle
index a4279c21e..aa9bdd798 100644
--- a/app/ui/setup/build.gradle
+++ b/app/ui/setup/build.gradle
@@ -27,6 +27,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.ui.setup'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 
diff --git a/app/ui/setup/src/main/AndroidManifest.xml b/app/ui/setup/src/main/AndroidManifest.xml
deleted file mode 100644
index a770e75ee..000000000
--- a/app/ui/setup/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.fsck.k9.ui.setup" />
diff --git a/plugins/openpgp-api-lib/openpgp-api/build.gradle b/plugins/openpgp-api-lib/openpgp-api/build.gradle
index 302e7267a..ce8cf248e 100644
--- a/plugins/openpgp-api-lib/openpgp-api/build.gradle
+++ b/plugins/openpgp-api-lib/openpgp-api/build.gradle
@@ -1,6 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
+    namespace 'org.openintents.openpgp'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 
diff --git a/plugins/openpgp-api-lib/openpgp-api/src/main/AndroidManifest.xml b/plugins/openpgp-api-lib/openpgp-api/src/main/AndroidManifest.xml
deleted file mode 100644
index f1f29cf3c..000000000
--- a/plugins/openpgp-api-lib/openpgp-api/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.openintents.openpgp">
-
-    <application/>
-
-</manifest>
\ No newline at end of file