diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8169a7aa94..82fb08a47e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,7 +44,8 @@
         android:name="com.battlelancer.seriesguide.SgApp"
         android:allowBackup="true"
         android:backupAgent="com.battlelancer.seriesguide.SgBackupAgent"
-        android:fullBackupContent="@xml/sg_full_backup_rules"
+        android:dataExtractionRules="@xml/sg_backup_rules_android_12"
+        android:fullBackupContent="@xml/sg_backup_rules"
         android:fullBackupOnly="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/battlelancer/seriesguide/dataliberation/AutoBackupTools.kt b/app/src/main/java/com/battlelancer/seriesguide/dataliberation/AutoBackupTools.kt
index b42e3e7453..25a16dd264 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/dataliberation/AutoBackupTools.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/dataliberation/AutoBackupTools.kt
@@ -11,6 +11,8 @@ import java.util.Calendar
 
 object AutoBackupTools {
 
+    private const val BACKUP_FOLDER_NAME = "Backups"
+
     @Throws(AutoBackupException::class)
     fun getBackupDirectory(context: Context): File {
         val storage = context.getExternalFilesDir(null)
@@ -20,7 +22,7 @@ object AutoBackupTools {
             throw AutoBackupException("Storage not mounted.")
         }
 
-        return File(storage, "Backups")
+        return File(storage, BACKUP_FOLDER_NAME)
     }
 
     fun deleteOldBackups(context: Context) {
diff --git a/app/src/main/res/xml/sg_backup_rules.xml b/app/src/main/res/xml/sg_backup_rules.xml
new file mode 100644
index 0000000000..0fe533e853
--- /dev/null
+++ b/app/src/main/res/xml/sg_backup_rules.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Configures auto-backup for Android 6 up to 11. -->
+<!-- https://developer.android.com/guide/topics/data/autobackup -->
+<full-backup-content>
+    <!-- Including the database, it likely won't exceed the 25 MB limit for Cloud. -->
+    <!-- E.g. 2000 episodes (~15 shows) consume around 2 MB. -->
+    <include domain="database" />
+
+    <!-- Include all settings files (app, extensions, widget, Trakt),
+    might include some unnecessary ones (Crashlytics) but all are < 1 KB. -->
+    <include domain="sharedpref" />
+
+    <!-- Do not include automatic backups to keep below 25 MB limit for CLoud. -->
+
+</full-backup-content>
diff --git a/app/src/main/res/xml/sg_backup_rules_android_12.xml b/app/src/main/res/xml/sg_backup_rules_android_12.xml
new file mode 100644
index 0000000000..ebacbc07c3
--- /dev/null
+++ b/app/src/main/res/xml/sg_backup_rules_android_12.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Configures auto-backup for Android 12+. -->
+<!-- https://developer.android.com/guide/topics/data/autobackup -->
+<data-extraction-rules>
+    <cloud-backup disableIfNoEncryptionCapabilities="false">
+        <!-- Including the database, it likely won't exceed the 25 MB limit for Cloud. -->
+        <!-- E.g. 2000 episodes (~15 shows) consume around 2 MB. -->
+        <include domain="database" />
+
+        <!-- Include all settings files (app, extensions, widget, Trakt),
+        might include some unnecessary ones (Crashlytics) but all are < 1 KB. -->
+        <include domain="sharedpref" />
+
+        <!-- Do not include automatic backups to keep below 25 MB limit for CLoud. -->
+    </cloud-backup>
+    <device-transfer>
+        <!-- Include as much as possible as device-to-device transfer has a 2 GB limit. -->
+        <include domain="database" />
+
+        <!-- Include all settings files (app, extensions, widget, Trakt),
+        might include some unnecessary ones (Crashlytics) but all are < 1 KB. -->
+        <include domain="sharedpref" />
+
+        <!-- Include automatic backup files. -->
+        <include
+            domain="external"
+            path="Backups/" />
+    </device-transfer>
+</data-extraction-rules>
diff --git a/app/src/main/res/xml/sg_full_backup_rules.xml b/app/src/main/res/xml/sg_full_backup_rules.xml
deleted file mode 100644
index 23cba65f2a..0000000000
--- a/app/src/main/res/xml/sg_full_backup_rules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<full-backup-content>
-    <!-- Instead of excluding a bunch of prefs, like for Crashlytics and TheTVDB, include. -->
-    <!-- Not including the database, it likely exceeds the 25 MB limit. -->
-    <!-- https://developer.android.com/guide/topics/data/autobackup -->
-    <include domain="sharedpref" path="com.battlelancer.seriesguide_preferences.xml" />
-    <!-- Recent automatic backups. -->
-    <include domain="external" path="Backups/" />
-</full-backup-content>
\ No newline at end of file