diff --git a/metadata/com.google.android.accessibility.talkback.txt b/metadata/com.google.android.accessibility.talkback.txt
deleted file mode 100644
index dfcd763e22..0000000000
--- a/metadata/com.google.android.accessibility.talkback.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Disabled:Possibly causes https://gitlab.com/fdroid/fdroidclient/issues/1416
-Categories:System
-License:Apache-2.0
-Web Site:https://support.google.com/accessibility/android/answer/6283677?hl=en
-Source Code:https://github.com/google/talkback
-Issue Tracker:
-
-Auto Name:TalkBack
-Summary:Accessibility improvements
-Description:
-TalkBack is an Accessibility Service that helps blind and vision-impaired users
-interact with their devices more easily.
-
-This application adds spoken, audible, and vibration feedback to your device.
-
-It comes pre-installed on many devices so you won't be able to install this if
-that is the case.
-
-It's only activated if you explicitly turn on Accessibility:
-
-# Go to Settings
-# Select Accessibility
-# Enable TalkBack checkboxes
-.
-
-Repo Type:git
-Repo:https://github.com/google/talkback.git
-
-Build:6.1,50200001
-    commit=e69d4731fce02bb9e69613d0e48c29033cad4a98
-    patch=play-services.patch,android-21.patch
-    gradle=yes
-    prebuild=rm libs/*.jar
-    novcheck=yes
-
-Auto Update Mode:None
-Update Check Mode:None
diff --git a/metadata/com.google.android.accessibility.talkback.yml b/metadata/com.google.android.accessibility.talkback.yml
new file mode 100644
index 0000000000..d3cf6545e2
--- /dev/null
+++ b/metadata/com.google.android.accessibility.talkback.yml
@@ -0,0 +1,43 @@
+Categories:
+  - System
+License: Apache-2.0
+WebSite: https://support.google.com/accessibility/android/answer/6283677?hl=en
+SourceCode: https://github.com/google/talkback
+
+AutoName: TalkBack
+Summary: Accessibility improvements
+Description: |-
+    TalkBack is an Accessibility Service that helps blind and vision-impaired users
+    interact with their devices more easily.
+
+    This application adds spoken, audible, and vibration feedback to your device.
+
+    It comes pre-installed on many devices so you won't be able to install this if
+    that is the case.
+
+    It's only activated if you explicitly turn on Accessibility:
+
+    # Go to Settings
+    # Select Accessibility
+    # Enable TalkBack checkboxes
+
+RepoType: git
+Repo: https://github.com/google/talkback.git
+
+Builds:
+  - versionName: 6.1.1
+    versionCode: 50200001
+    commit: 6.1.1
+    patch:
+      - play-services.patch
+    gradle:
+      - yes
+    rm:
+      - libs
+    prebuild: sed -i 's/android:versionCode=/android:versionName="$$VERSION$$" android:versionCode=/'
+        src/main/AndroidManifest.xml
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 6.1.1
+CurrentVersionCode: 50200001
diff --git a/metadata/com.google.android.accessibility.talkback/android-21.patch b/metadata/com.google.android.accessibility.talkback/android-21.patch
deleted file mode 100644
index 058667f5f0..0000000000
--- a/metadata/com.google.android.accessibility.talkback/android-21.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build.gradle b/build.gradle
-index c67eb3b..de6b1ac 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -25,7 +25,7 @@ allprojects {
- android {
-     buildToolsVersion '27.0.0'
-     defaultConfig {
--        minSdkVersion 26
-+        minSdkVersion 21
-         targetSdkVersion 27
-         testInstrumentationRunner 'android.test.InstrumentationTestRunner'
-         multiDexEnabled true