diff --git a/metadata/itkach.aard2.txt b/metadata/itkach.aard2.txt
deleted file mode 100644
index a9bef01357..0000000000
--- a/metadata/itkach.aard2.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Categories:Reading
-License:GPL-3.0-only
-Web Site:http://aarddict.org
-Source Code:https://github.com/itkach/aard2-android
-Issue Tracker:https://github.com/itkach/aard2-android/issues
-
-Auto Name:Aard 2
-Summary:Offline dictionary
-Description:
-Aard 2 for Android is a successor to [[aarddict.android]]. It comes with
-redesigned user interface, bookmarks, history and a better dictionary storage
-format.
-.
-
-Repo Type:git
-Repo:https://github.com/itkach/aard2-android.git
-
-Build:0.33,33
-    disable=see maintainer notes
-    commit=0.33
-    gradle=yes
-
-Build:0.36,36
-    disable=see maintainer notes
-    commit=0.36
-    gradle=yes
-
-Maintainer Notes:
-* "includes" projects from source but doesn't use submodules nor vendors them
-* slobj has a jar file
-.
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:0.39
-Current Version Code:39
diff --git a/metadata/itkach.aard2.yml b/metadata/itkach.aard2.yml
new file mode 100644
index 0000000000..efae2e75a9
--- /dev/null
+++ b/metadata/itkach.aard2.yml
@@ -0,0 +1,40 @@
+Categories:
+  - Reading
+License: GPL-3.0-only
+WebSite: http://aarddict.org
+SourceCode: https://github.com/itkach/aard2-android
+IssueTracker: https://github.com/itkach/aard2-android/issues
+
+AutoName: Aard 2
+Summary: Offline dictionary
+Description: |-
+    Aard 2 for Android is a successor to [[aarddict.android]]. It comes with
+    redesigned user interface, bookmarks, history and a better dictionary storage
+    format.
+
+RepoType: git
+Repo: https://github.com/itkach/aard2-android.git
+
+Builds:
+  - versionName: '0.33'
+    versionCode: 33
+    disable: see maintainer notes
+    commit: '0.33'
+    gradle:
+      - yes
+
+  - versionName: '0.36'
+    versionCode: 36
+    disable: see maintainer notes
+    commit: '0.36'
+    gradle:
+      - yes
+
+MaintainerNotes: |-
+    * "includes" projects from source but doesn't use submodules nor vendors them
+    * slobj has a jar file
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: '0.39'
+CurrentVersionCode: 39