diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/PackageManagerCompat.kt b/AnkiDroid/src/main/java/com/ichi2/compat/PackageManagerCompat.kt
index 989a1b47a8..bbbea23420 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/PackageManagerCompat.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/PackageManagerCompat.kt
@@ -129,6 +129,7 @@ const val GET_ATTRIBUTIONS = -0x80000000 // API 31
 
 @LongDef(
     flag = true,
+    open = true, // HACK: AGP 8.6.1 broke .toLong(): https://issuetracker.google.com/issues/367752734
     // prefix = ["GET_", "MATCH_"],
     value = [
         AndroidPackageManager.GET_ACTIVITIES.toLong(),
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/ResolveInfoCompat.kt b/AnkiDroid/src/main/java/com/ichi2/compat/ResolveInfoCompat.kt
index 0177aae26b..9aa0dbd36b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/ResolveInfoCompat.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/ResolveInfoCompat.kt
@@ -152,6 +152,7 @@ const val MATCH_DIRECT_BOOT_UNAWARE = 0x00040000
 
 @LongDef(
     flag = true,
+    open = true, // HACK: AGP 8.6.1 broke .toLong(): https://issuetracker.google.com/issues/367752734
     // prefix = ["GET_", "MATCH_"],
     value = [
         GET_META_DATA.toLong(),
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e879b36576..08bb6d8981 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ acra = '5.11.4'
 #
 # Old changelogs - See 'Table of Contents' in sidebar
 # https://developer.android.com/build/releases/past-releases
-androidGradlePlugin = "8.6.0"
+androidGradlePlugin = "8.6.1"
 # https://developer.android.com/jetpack/androidx/releases/activity
 androidxActivity = "1.9.2"
 # https://developer.android.com/jetpack/androidx/releases/annotation