diff --git a/app/build.gradle b/app/build.gradle
index 3f6bec872c..0e859f006b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.bugsnag.android.gradle'
 
 def keystorePropertiesFile = rootProject.file("keystore.properties")
 def keystoreProperties = new Properties()
@@ -164,6 +165,19 @@ android {
             setIgnore(true)
         }
     }
+
+    bugsnag {
+        // https://docs.bugsnag.com/build-integrations/gradle/
+        uploadJvmMappings = false // disables upload of ProGuard/DexGuard/R8 mapping files
+        uploadNdkMappings = false // disables upload of NDK mapping files
+        reportBuilds = false // disables upload of build metadata
+        overwrite = true
+        builderName = "M66B"
+        sourceControl {
+            provider = "github-enterprise"
+            repository = "https://github.com/M66B/FairEmail"
+        }
+    }
 }
 
 task copyMarkdown(type: Copy) {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3ac044488d..d062880013 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -121,6 +121,9 @@
         <meta-data
             android:name="android.allow_multiple_resumed_activities"
             android:value="true" />
+        <meta-data
+            android:name="com.bugsnag.android.API_KEY"
+            android:value="9d2d57476a0614974449a3ec33f2604a" />
 
         <activity
             android:name=".ActivityMain"
diff --git a/build.gradle b/build.gradle
index 7584ea7494..f5c26e0be6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,8 @@ buildscript {
     dependencies {
         // https://developer.android.com/studio/releases/gradle-plugin
         classpath 'com.android.tools.build:gradle:4.1.0'
+        // https://github.com/bugsnag/bugsnag-android-gradle-plugin
+        classpath 'com.bugsnag:bugsnag-android-gradle-plugin:5.2.0'
     }
 }