diff --git a/metadata/eu.e43.impeller.txt b/metadata/eu.e43.impeller.txt
deleted file mode 100644
index 452e2c341c..0000000000
--- a/metadata/eu.e43.impeller.txt
+++ /dev/null
@@ -1,205 +0,0 @@
-Categories:Internet
-License:Apache-2.0
-Web Site:http://impeller.e43.eu
-Source Code:https://github.com/oshepherd/Impeller
-Issue Tracker:https://e43oss.atlassian.net/browse/IMP
-
-Auto Name:Impeller
-Summary:Client for the Pump.io network
-Description:
-A client for [http://pump.io pump.io], a stream server for distributed social
-networking and microblogging. Register a [http://pump.io/tryit.html free
-account] at a participating website and follow some
-[https://static.jpope.org/users.html people], before using the app.
-.
-
-Repo Type:git
-Repo:https://github.com/oshepherd/Impeller.git
-
-Build:0.1,2
-    commit=24cfa5
-
-Build:0.2,3
-    commit=v0.2
-
-Build:0.2.1,4
-    commit=v0.2.1
-
-Build:0.3.0,6
-    commit=v0.3.0
-
-Build:0.3.1,7
-    commit=v0.3.1
-
-Build:0.3.2,8
-    commit=v0.3.2
-
-Build:0.3.3,9
-    commit=v0.3.3
-
-Build:0.3.4,10
-    commit=v0.3.4
-
-Build:0.4,11
-    commit=v0.4
-
-Build:0.4.1,12
-    commit=v0.4.1
-
-Build:0.4.3,15
-    commit=v0.4.3
-
-Build:0.4.4,16
-    commit=v0.4.4
-    init=rm jiraconnect-android-main/build.xml
-    update=.,jiraconnect-android-main
-
-Build:0.4.5,17
-    commit=v0.4.5
-    init=rm jiraconnect-android-main/build.xml
-    update=.,jiraconnect-android-main
-
-Build:0.4.6,4006
-    commit=v0.4.6
-    init=rm jiraconnect-android-main/build.xml
-    update=.,jiraconnect-android-main
-
-Build:0.4.7,4007
-    commit=v0.4.7
-    init=rm jiraconnect-android-main/build.xml
-    update=.,jiraconnect-android-main
-
-Build:0.5.1,5001
-    commit=v0.5.1
-    init=rm jiraconnect-android-main/build.xml
-    update=.,jiraconnect-android-main
-
-Build:0.5.2,5002
-    commit=v0.5.2
-    init=rm jiraconnect-android-main/build.xml
-    update=.,jiraconnect-android-main
-
-Build:0.5.3,5003
-    commit=v0.5.3
-    init=rm jiraconnect-android-main/build.xml
-    update=.,jiraconnect-android-main
-
-Build:0.5.5,5005
-    commit=v0.5.5
-    init=rm jiraconnect-android-main/build.xml
-    update=.,jiraconnect-android-main
-
-Build:0.6.0,6000
-    commit=v0.6.0
-    init=rm jiraconnect-android-main/build.xml
-    update=.,jiraconnect-android-main
-
-Build:0.6.1,6001
-    commit=v0.6.1
-    init=rm jiraconnect-android-main/build.xml
-    extlibs=android/android-support-v4.jar,oauth-signpost/signpost-core-1.2.1.2.jar
-    prebuild=printf 'android.library.reference.1=jiraconnect-android-main' >> project.properties && \
-        mkdir -p jiraconnect-android-main/libs && \
-        cd jiraconnect-android-main/libs/ && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/acra-4.5.0.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/apache-mime4j-0.5.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/commons-io-2.4.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/guava-r08.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpclient-4.0.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpcore-4.0-beta3.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpmime-4.0-beta2.jar
-    update=.,jiraconnect-android-main
-    target=android-18
-
-Build:0.6.2,6002
-    commit=v0.6.2
-    init=rm jiraconnect-android-main/build.xml
-    extlibs=android/android-support-v4.jar,oauth-signpost/signpost-core-1.2.1.2.jar
-    prebuild=printf 'android.library.reference.1=jiraconnect-android-main' >> project.properties && \
-        mkdir -p jiraconnect-android-main/libs && \
-        cd jiraconnect-android-main/libs/ && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/acra-4.5.0.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/apache-mime4j-0.5.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/commons-io-2.4.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/guava-r08.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpclient-4.0.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpcore-4.0-beta3.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpmime-4.0-beta2.jar
-    update=.,jiraconnect-android-main
-    target=android-18
-
-Build:0.7.0,7000
-    commit=v0.7.0
-    init=rm jiraconnect-android-main/build.xml
-    extlibs=android/android-support-v4.jar,oauth-signpost/signpost-core-1.2.1.2.jar
-    prebuild=printf 'android.library.reference.1=jiraconnect-android-main' >> project.properties && \
-        mkdir -p jiraconnect-android-main/libs && \
-        cd jiraconnect-android-main/libs/ && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/acra-4.5.0.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/apache-mime4j-0.5.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/commons-io-2.4.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/guava-r08.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpclient-4.0.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpcore-4.0-beta3.jar && \
-        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpmime-4.0-beta2.jar
-    target=android-18
-
-Build:0.8.2,8002
-    commit=v0.8.2
-    gradle=yes
-
-Build:0.8.3,8003
-    commit=v0.8.3
-    gradle=yes
-
-Build:0.8.5,8005
-    commit=v0.8.5
-    gradle=yes
-
-Build:0.8.6,8006
-    commit=v0.8.6
-    gradle=yes
-
-Build:0.8.7,8007
-    commit=v0.8.7
-    gradle=yes
-
-Build:0.9a,9001
-    commit=v0.9a
-    submodules=yes
-    gradle=yes
-
-Build:0.9b,9002
-    commit=v0.9b
-    submodules=yes
-    gradle=yes
-
-Build:0.9.1,9010
-    commit=v0.9.1
-    submodules=yes
-    gradle=yes
-
-Build:0.9.5,9050
-    commit=v0.9.5
-    submodules=yes
-    gradle=yes
-
-Build:0.9.5a,9051
-    commit=v0.9.5a
-    submodules=yes
-    gradle=yes
-
-Build:0.9.5b,9052
-    commit=v0.9.5b
-    submodules=yes
-    gradle=yes
-
-Maintainer Notes:
-Although in auto mode, builds for 0.8.0 and 0.8.1 were skipped because source
-code was not pushed to the upstream repo.
-.
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.9.5b
-Current Version Code:9052
diff --git a/metadata/eu.e43.impeller.yml b/metadata/eu.e43.impeller.yml
new file mode 100644
index 0000000000..695731d37a
--- /dev/null
+++ b/metadata/eu.e43.impeller.yml
@@ -0,0 +1,281 @@
+Categories:
+  - Internet
+License: Apache-2.0
+WebSite: http://impeller.e43.eu
+SourceCode: https://github.com/oshepherd/Impeller
+IssueTracker: https://e43oss.atlassian.net/browse/IMP
+
+AutoName: Impeller
+Summary: Client for the Pump.io network
+Description: |-
+    A client for [http://pump.io pump.io], a stream server for distributed social
+    networking and microblogging. Register a [http://pump.io/tryit.html free
+    account] at a participating website and follow some
+    [https://static.jpope.org/users.html people], before using the app.
+
+RepoType: git
+Repo: https://github.com/oshepherd/Impeller.git
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 2
+    commit: 24cfa5
+
+  - versionName: '0.2'
+    versionCode: 3
+    commit: v0.2
+
+  - versionName: 0.2.1
+    versionCode: 4
+    commit: v0.2.1
+
+  - versionName: 0.3.0
+    versionCode: 6
+    commit: v0.3.0
+
+  - versionName: 0.3.1
+    versionCode: 7
+    commit: v0.3.1
+
+  - versionName: 0.3.2
+    versionCode: 8
+    commit: v0.3.2
+
+  - versionName: 0.3.3
+    versionCode: 9
+    commit: v0.3.3
+
+  - versionName: 0.3.4
+    versionCode: 10
+    commit: v0.3.4
+
+  - versionName: '0.4'
+    versionCode: 11
+    commit: v0.4
+
+  - versionName: 0.4.1
+    versionCode: 12
+    commit: v0.4.1
+
+  - versionName: 0.4.3
+    versionCode: 15
+    commit: v0.4.3
+
+  - versionName: 0.4.4
+    versionCode: 16
+    commit: v0.4.4
+    init: rm jiraconnect-android-main/build.xml
+    androidupdate:
+      - .
+      - jiraconnect-android-main
+
+  - versionName: 0.4.5
+    versionCode: 17
+    commit: v0.4.5
+    init: rm jiraconnect-android-main/build.xml
+    androidupdate:
+      - .
+      - jiraconnect-android-main
+
+  - versionName: 0.4.6
+    versionCode: 4006
+    commit: v0.4.6
+    init: rm jiraconnect-android-main/build.xml
+    androidupdate:
+      - .
+      - jiraconnect-android-main
+
+  - versionName: 0.4.7
+    versionCode: 4007
+    commit: v0.4.7
+    init: rm jiraconnect-android-main/build.xml
+    androidupdate:
+      - .
+      - jiraconnect-android-main
+
+  - versionName: 0.5.1
+    versionCode: 5001
+    commit: v0.5.1
+    init: rm jiraconnect-android-main/build.xml
+    androidupdate:
+      - .
+      - jiraconnect-android-main
+
+  - versionName: 0.5.2
+    versionCode: 5002
+    commit: v0.5.2
+    init: rm jiraconnect-android-main/build.xml
+    androidupdate:
+      - .
+      - jiraconnect-android-main
+
+  - versionName: 0.5.3
+    versionCode: 5003
+    commit: v0.5.3
+    init: rm jiraconnect-android-main/build.xml
+    androidupdate:
+      - .
+      - jiraconnect-android-main
+
+  - versionName: 0.5.5
+    versionCode: 5005
+    commit: v0.5.5
+    init: rm jiraconnect-android-main/build.xml
+    androidupdate:
+      - .
+      - jiraconnect-android-main
+
+  - versionName: 0.6.0
+    versionCode: 6000
+    commit: v0.6.0
+    init: rm jiraconnect-android-main/build.xml
+    androidupdate:
+      - .
+      - jiraconnect-android-main
+
+  - versionName: 0.6.1
+    versionCode: 6001
+    commit: v0.6.1
+    init: rm jiraconnect-android-main/build.xml
+    extlibs:
+      - android/android-support-v4.jar
+      - oauth-signpost/signpost-core-1.2.1.2.jar
+    prebuild:
+      - printf 'android.library.reference.1=jiraconnect-android-main' >> project.properties
+      - mkdir -p jiraconnect-android-main/libs
+      - cd jiraconnect-android-main/libs/
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/acra-4.5.0.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/apache-mime4j-0.5.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/commons-io-2.4.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/guava-r08.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpclient-4.0.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpcore-4.0-beta3.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpmime-4.0-beta2.jar
+    androidupdate:
+      - .
+      - jiraconnect-android-main
+    target: android-18
+
+  - versionName: 0.6.2
+    versionCode: 6002
+    commit: v0.6.2
+    init: rm jiraconnect-android-main/build.xml
+    extlibs:
+      - android/android-support-v4.jar
+      - oauth-signpost/signpost-core-1.2.1.2.jar
+    prebuild:
+      - printf 'android.library.reference.1=jiraconnect-android-main' >> project.properties
+      - mkdir -p jiraconnect-android-main/libs
+      - cd jiraconnect-android-main/libs/
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/acra-4.5.0.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/apache-mime4j-0.5.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/commons-io-2.4.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/guava-r08.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpclient-4.0.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpcore-4.0-beta3.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpmime-4.0-beta2.jar
+    androidupdate:
+      - .
+      - jiraconnect-android-main
+    target: android-18
+
+  - versionName: 0.7.0
+    versionCode: 7000
+    commit: v0.7.0
+    init: rm jiraconnect-android-main/build.xml
+    extlibs:
+      - android/android-support-v4.jar
+      - oauth-signpost/signpost-core-1.2.1.2.jar
+    prebuild:
+      - printf 'android.library.reference.1=jiraconnect-android-main' >> project.properties
+      - mkdir -p jiraconnect-android-main/libs
+      - cd jiraconnect-android-main/libs/
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/acra-4.5.0.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/apache-mime4j-0.5.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/commons-io-2.4.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/guava-r08.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpclient-4.0.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpcore-4.0-beta3.jar
+      - wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpmime-4.0-beta2.jar
+    target: android-18
+
+  - versionName: 0.8.2
+    versionCode: 8002
+    commit: v0.8.2
+    gradle:
+      - yes
+
+  - versionName: 0.8.3
+    versionCode: 8003
+    commit: v0.8.3
+    gradle:
+      - yes
+
+  - versionName: 0.8.5
+    versionCode: 8005
+    commit: v0.8.5
+    gradle:
+      - yes
+
+  - versionName: 0.8.6
+    versionCode: 8006
+    commit: v0.8.6
+    gradle:
+      - yes
+
+  - versionName: 0.8.7
+    versionCode: 8007
+    commit: v0.8.7
+    gradle:
+      - yes
+
+  - versionName: 0.9a
+    versionCode: 9001
+    commit: v0.9a
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.9b
+    versionCode: 9002
+    commit: v0.9b
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.9.1
+    versionCode: 9010
+    commit: v0.9.1
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.9.5
+    versionCode: 9050
+    commit: v0.9.5
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.9.5a
+    versionCode: 9051
+    commit: v0.9.5a
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.9.5b
+    versionCode: 9052
+    commit: v0.9.5b
+    submodules: true
+    gradle:
+      - yes
+
+MaintainerNotes: |-
+    Although in auto mode, builds for 0.8.0 and 0.8.1 were skipped because source
+    code was not pushed to the upstream repo.
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.9.5b
+CurrentVersionCode: 9052