diff --git a/.gitignore b/.gitignore
index 037fe9275..a535ce347 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 LatinIME.iml
 build/
 local.properties
+crashreporting.properties
+keystore.properties
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index e6ee01b90..a54bccff9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,6 +51,16 @@ android {
     	project.logger.lifecycle('keystore.properties not found, APK may not be signed')
     }
 
+
+    final def crashReportPropertiesFile = rootProject.file("crashreporting.properties")
+    final def crashReportProperties = new Properties()
+    if (crashReportPropertiesFile.exists()) {
+        crashReportProperties.load(new FileInputStream(crashReportPropertiesFile))
+    } else {
+        project.logger.lifecycle('crashreporting.properties not found, crash reporting will be disabled')
+    }
+
+
     buildTypes {
         debug {
             minifyEnabled false
@@ -60,6 +70,24 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.flags'
             signingConfig releaseSigning
         }
+
+        buildTypes.each {
+            if (crashReportPropertiesFile.exists()) {
+                it.buildConfigField "boolean", "ENABLE_ACRA", crashReportProperties['acraEnabled']
+                it.buildConfigField "String", "ACRA_URL", crashReportProperties['acraUrl']
+                it.buildConfigField "String", "ACRA_USER", crashReportProperties['acraUser']
+                it.buildConfigField "String", "ACRA_PASSWORD", crashReportProperties['acraPassword']
+            } else {
+                it.buildConfigField "boolean", "ENABLE_ACRA", "false"
+                it.buildConfigField "String", "ACRA_URL", ""
+                it.buildConfigField "String", "ACRA_USER", ""
+                it.buildConfigField "String", "ACRA_PASSWORD", ""
+            }
+        }
+    }
+
+    buildFeatures {
+        buildConfig = true
     }
 
     compileOptions {
@@ -132,6 +160,9 @@ dependencies {
     implementation 'androidx.datastore:datastore-preferences:1.0.0'
     implementation 'androidx.autofill:autofill:1.1.0'
 
+    implementation 'ch.acra:acra-http:5.11.1'
+    implementation 'ch.acra:acra-dialog:5.11.1'
+
     implementation project(":voiceinput-shared")
 
     debugImplementation 'androidx.compose.ui:ui-tooling'
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index f6ec093f4..4bc131b9c 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -56,7 +56,8 @@
          android:supportsRtl="true"
          android:allowBackup="true"
          android:defaultToDeviceProtectedStorage="true"
-         android:directBootAware="true">
+         android:directBootAware="true"
+         android:name=".CrashLoggingApplication">
 
         <!-- Services -->
         <service android:name=".LatinIME"
diff --git a/java/src/org/futo/inputmethod/latin/CrashLoggingApplication.kt b/java/src/org/futo/inputmethod/latin/CrashLoggingApplication.kt
new file mode 100644
index 000000000..e727d1b88
--- /dev/null
+++ b/java/src/org/futo/inputmethod/latin/CrashLoggingApplication.kt
@@ -0,0 +1,36 @@
+package org.futo.inputmethod.latin
+
+import android.app.Application
+import android.content.Context
+import org.acra.config.dialog
+import org.acra.config.httpSender
+import org.acra.data.StringFormat
+import org.acra.ktx.initAcra
+import org.acra.sender.HttpSender
+
+class CrashLoggingApplication : Application() {
+    override fun attachBaseContext(base: Context?) {
+        super.attachBaseContext(base)
+
+        if(BuildConfig.ENABLE_ACRA) {
+            initAcra {
+                reportFormat = StringFormat.JSON
+
+                dialog {
+                    text = "FUTO Keyboard has crashed! Please send a report to help us fix this."
+                    title = "Crash"
+                    positiveButtonText = "Send Report"
+                    negativeButtonText = "Ignore"
+                    resTheme = android.R.style.Theme_DeviceDefault_Dialog
+                }
+
+                httpSender {
+                    uri = BuildConfig.ACRA_URL
+                    basicAuthLogin = BuildConfig.ACRA_USER
+                    basicAuthPassword = BuildConfig.ACRA_PASSWORD
+                    httpMethod = HttpSender.Method.POST
+                }
+            }
+        }
+    }
+}
\ No newline at end of file