diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f53fc1889..579c6e6ef7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,4 +37,5 @@ lint:
     - echo "these images have EXIF that must be stripped:"
     - git --no-pager diff --stat
     - git --no-pager diff --name-only --exit-code || export EXITVALUE=1
+    - ./tools/check-keyalias-collision.py || export EXITVALUE=1
     - exit $EXITVALUE
diff --git a/metadata/ar.rulosoft.mimanganu.txt b/metadata/ar.rulosoft.mimanganu.txt
index c474975a4f..ca3efcc9f1 100644
--- a/metadata/ar.rulosoft.mimanganu.txt
+++ b/metadata/ar.rulosoft.mimanganu.txt
@@ -634,11 +634,20 @@ Build:1.87,87
         sed -i -e '/rapid.decoder/d' build.gradle && \
         sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g' ../build.gradle
 
+Build:1.88,88
+    commit=1.88
+    subdir=app
+    gradle=yes
+    srclibs=RapidDecoder@7cdfca4
+    prebuild=cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/ && \
+        sed -i -e '/rapid.decoder/d' build.gradle && \
+        sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g' ../build.gradle
+
 Maintainer Notes:
 RapidDecoder 0.3.0 is required, but this version is not tagged.
 .
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:1.87
-Current Version Code:87
+Current Version:1.88
+Current Version Code:88
diff --git a/metadata/at.bitfire.davdroid.txt b/metadata/at.bitfire.davdroid.txt
index c1501ba6f7..8d641d8244 100644
--- a/metadata/at.bitfire.davdroid.txt
+++ b/metadata/at.bitfire.davdroid.txt
@@ -788,7 +788,13 @@ Build:2.0.2-ose,243
     submodules=yes
     gradle=standard
 
+Build:2.0.3-ose,244
+    commit=v2.0.3-ose
+    subdir=app
+    submodules=yes
+    gradle=standard
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags ^v[0-9.]+-ose$
-Current Version:2.0.2-ose
-Current Version Code:243
+Current Version:2.0.3-ose
+Current Version Code:244
diff --git a/metadata/ch.blinkenlights.android.vanilla.txt b/metadata/ch.blinkenlights.android.vanilla.txt
index 742c70d573..9227f85cfc 100644
--- a/metadata/ch.blinkenlights.android.vanilla.txt
+++ b/metadata/ch.blinkenlights.android.vanilla.txt
@@ -204,7 +204,12 @@ Build:1.0.71,10710
     subdir=app
     gradle=yes
 
+Build:1.0.72,10720
+    commit=1.0.72
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:1.0.71
-Current Version Code:10710
+Current Version:1.0.72
+Current Version Code:10720
diff --git a/metadata/com.byagowi.persiancalendar.txt b/metadata/com.byagowi.persiancalendar.txt
index 23785dc4e2..e8975c970d 100644
--- a/metadata/com.byagowi.persiancalendar.txt
+++ b/metadata/com.byagowi.persiancalendar.txt
@@ -200,7 +200,12 @@ Build:5.8.8,588
     subdir=PersianCalendar
     gradle=yes
 
+Build:5.9.1,591
+    commit=v5.9.1
+    subdir=PersianCalendar
+    gradle=yes
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags ^[0-9.v]*$
-Current Version:5.8.8
-Current Version Code:588
+Current Version:5.9.1
+Current Version Code:591
diff --git a/metadata/com.etesync.syncadapter.txt b/metadata/com.etesync.syncadapter.txt
index f9d6196295..ab60355248 100644
--- a/metadata/com.etesync.syncadapter.txt
+++ b/metadata/com.etesync.syncadapter.txt
@@ -182,6 +182,12 @@ Build:0.21.1,31
     submodules=yes
     gradle=yes
 
+Build:0.21.2,32
+    commit=v0.21.2
+    subdir=app
+    submodules=yes
+    gradle=yes
+
 Maintainer Notes:
 Summary and Description are maintained by upstream using fastlane in
 the source repo:
@@ -190,5 +196,5 @@ https://f-droid.org/docs/All_About_Descriptions_Graphics_and_Screenshots
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:0.21.1
-Current Version Code:31
+Current Version:0.21.2
+Current Version Code:32
diff --git a/metadata/com.greenaddress.greenbits_android_wallet.txt b/metadata/com.greenaddress.greenbits_android_wallet.txt
index 819f51f4b3..04ca23f244 100644
--- a/metadata/com.greenaddress.greenbits_android_wallet.txt
+++ b/metadata/com.greenaddress.greenbits_android_wallet.txt
@@ -686,11 +686,22 @@ Build:2.06,206
     build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh
     ndk=r17b
 
+Build:2.07,207
+    commit=r2.07
+    subdir=app
+    gradle=production
+    forcevercode=yes
+    prebuild=sed -i -e 's/output.versionCodeOverride =/0 + /g' build.gradle
+    scanignore=bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts,bitcoinj/core/src/test,app/src/main/assets/production/checkpoints
+    scandelete=app/src/main/assets/btctestnet/checkpoints
+    build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh
+    ndk=r17b
+
 Maintainer Notes:
 Watch prepare_fdroid.sh for changes on new builds.
 .
 
 Auto Update Mode:Version r%v
 Update Check Mode:Tags
-Current Version:2.06
-Current Version Code:206
+Current Version:2.07
+Current Version Code:207
diff --git a/metadata/com.igisw.openmoneybox.txt b/metadata/com.igisw.openmoneybox.txt
index 84508e153f..60d7dd6c8a 100644
--- a/metadata/com.igisw.openmoneybox.txt
+++ b/metadata/com.igisw.openmoneybox.txt
@@ -36,6 +36,11 @@ Build:3.2.2.2,21
     subdir=android/API26
     gradle=yes
 
+Build:3.2.2.3,22
+    commit=v3.2.2.3
+    subdir=android/API26
+    gradle=yes
+
 Maintainer Notes:
 Summary and Description have been moved to the new localizable text files:
 https://f-droid.org/docs/All_About_Descriptions_Graphics_and_Screenshots
@@ -43,5 +48,5 @@ https://f-droid.org/docs/All_About_Descriptions_Graphics_and_Screenshots
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:3.2.2.2
-Current Version Code:21
+Current Version:3.2.2.3
+Current Version Code:22
diff --git a/metadata/com.nextcloud.android.beta.txt b/metadata/com.nextcloud.android.beta.txt
index 16626d42b8..80d10cb953 100644
--- a/metadata/com.nextcloud.android.beta.txt
+++ b/metadata/com.nextcloud.android.beta.txt
@@ -1425,11 +1425,18 @@ Build:20180825,20180825
     rm=user_manual,gplay.gradle
     scandelete=src/androidTest
 
+Build:20180829,20180829
+    commit=dev-20180829
+    submodules=yes
+    gradle=versionDev
+    rm=user_manual,gplay.gradle
+    scandelete=src/androidTest
+
 Maintainer Notes:
 Tags get removed. See https://github.com/nextcloud/android/issues/969.
 .
 
 Auto Update Mode:Version dev-%c
 Update Check Mode:Tags ^dev
-Current Version:20180825
-Current Version Code:20180825
+Current Version:20180829
+Current Version Code:20180829
diff --git a/metadata/com.quaap.launchtime.txt b/metadata/com.quaap.launchtime.txt
index 4898acf036..ba7f6a7876 100644
--- a/metadata/com.quaap.launchtime.txt
+++ b/metadata/com.quaap.launchtime.txt
@@ -106,7 +106,12 @@ Build:0.8.2,820
     subdir=app
     gradle=yes
 
+Build:0.8.3,830
+    commit=v0.8.3
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags ^v[0-9\.]+$
-Current Version:0.8.2
-Current Version Code:820
+Current Version:0.8.3
+Current Version Code:830
diff --git a/metadata/com.stripe1.xmouse.yml b/metadata/com.stripe1.xmouse.yml
new file mode 100644
index 0000000000..59c80500c3
--- /dev/null
+++ b/metadata/com.stripe1.xmouse.yml
@@ -0,0 +1,45 @@
+Categories:
+  - System
+License: MIT
+WebSite: https://github.com/bradand/XMouse
+SourceCode: https://github.com/bradand/XMouse
+IssueTracker: https://github.com/bradand/XMouse/issues
+Bitcoin: 17DaqbcEEG3Hn5jBv3sRjPTUUCW1eBp1Wg
+
+AutoName: XMouse
+Summary: Remotely control X11 via SSH commands generated by your phone or tablet
+Description: |-
+    Remotely control a Linux Box X11 display via SSH commands generated by your
+    phone or tablet. Works well on the Raspberry Pi or any other Linux machine.
+
+    '''Features'''
+    * Authentication via password or private key (ssh-rsa only)
+    * Keyboard and Mouse emulation
+    * Mouse move, two finger scroll, two finger zoom in/out, one finger scroll on right edge, tap to click, short hold to initiate drag
+    * Customizable keyboard functions and position, can save multiple layout profiles
+    * Volume rocker on device mimics keyboard volume keys
+    * Many other special keys, your functionality may vary
+    * Send custom ssh commands
+    * Tested on Ubuntu Linux, not Windows, not Mac
+    * Minimal design
+    * Free with no ads
+
+    '''Required programs on Linux host machine'''
+    * openssh-server
+    * xdotool
+
+RepoType: git
+Repo: https://github.com/bradand/XMouse
+
+Builds:
+  - versionName: 2.0.27
+    versionCode: 25
+    commit: 7d61ecb805993aee4c1977b6af075ce4a6691077
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 2.0.27
+CurrentVersionCode: 25
diff --git a/metadata/com.termux.styling.txt b/metadata/com.termux.styling.txt
index a7f8db9a08..375a7d7638 100644
--- a/metadata/com.termux.styling.txt
+++ b/metadata/com.termux.styling.txt
@@ -84,7 +84,12 @@ Build:0.23,23
     subdir=app
     gradle=yes
 
+Build:0.24,24
+    commit=v0.24
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:0.23
-Current Version Code:23
+Current Version:0.24
+Current Version Code:24
diff --git a/metadata/com.waist.line.txt b/metadata/com.waist.line.txt
index 4bb80ffca7..3425005944 100644
--- a/metadata/com.waist.line.txt
+++ b/metadata/com.waist.line.txt
@@ -88,7 +88,21 @@ Build:2.2.1,20201
         popd && \
         cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar libs/barcodescanner-release-2.1.5.aar
 
+Build:2.2.2,20202
+    commit=v2.2.2
+    subdir=platforms/android/app
+    gradle=yes
+    srclibs=BarcodeScanner@2.1.5
+    rm=node_modules,platforms/android/CordovaLib/build/intermediates,platforms/android/app/build/intermediates,platforms/browser,plugins,platforms/android/app/libs/barcodescanner-release-2.1.5.aar
+    prebuild=sed -i -e '/gradleVersion/d' build.gradle
+    scandelete=platforms
+    build=pushd $$BarcodeScanner$$ && \
+        rm local.properties && \
+        gradle clean assembleRelease && \
+        popd && \
+        cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar libs/barcodescanner-release-2.1.5.aar
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:2.2.1
-Current Version Code:20201
+Current Version:2.2.2
+Current Version Code:20202
diff --git a/metadata/de.baumann.browser.txt b/metadata/de.baumann.browser.txt
index e75e6a3c61..203d79a806 100644
--- a/metadata/de.baumann.browser.txt
+++ b/metadata/de.baumann.browser.txt
@@ -254,7 +254,14 @@ Build:5.8,80
     prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
         sed -i -e '/jitpack.de/d' ../build.gradle
 
+Build:5.9,81
+    commit=v5.9
+    subdir=app
+    gradle=yes
+    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
+        sed -i -e '/jitpack.de/d' ../build.gradle
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:5.8
-Current Version Code:80
+Current Version:5.9
+Current Version Code:81
diff --git a/metadata/de.blau.android.txt b/metadata/de.blau.android.txt
index 8049c0358c..2c98608542 100644
--- a/metadata/de.blau.android.txt
+++ b/metadata/de.blau.android.txt
@@ -324,7 +324,12 @@ Build:11.0.4.0,610
     gradle=yes
     prebuild=sed -i -e '/bintray/d' -e '/markdown/d' -e '/preset-utils/d' build.gradle
 
+Build:11.0.5.0,611
+    commit=11.0.5.0
+    gradle=yes
+    prebuild=sed -i -e '/bintray/d' -e '/markdown/d' -e '/preset-utils/d' build.gradle
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags ^[0-9.]*$
-Current Version:11.0.4.0
-Current Version Code:610
+Current Version:11.0.5.0
+Current Version Code:611
diff --git a/metadata/de.k3b.android.androFotoFinder.txt b/metadata/de.k3b.android.androFotoFinder.txt
index 14a649e064..94913a5624 100644
--- a/metadata/de.k3b.android.androFotoFinder.txt
+++ b/metadata/de.k3b.android.androFotoFinder.txt
@@ -189,11 +189,16 @@ Build:0.7.0.180823,38
     subdir=app
     gradle=yes
 
+Build:0.7.1.180830,39
+    commit=v0.7.1.180830
+    subdir=app
+    gradle=yes
+
 Maintainer Notes:
 Please use git-branch "FDroid" for FDroid-builds.
 .
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:0.7.0.180823
-Current Version Code:38
+Current Version:0.7.1.180830
+Current Version Code:39
diff --git a/metadata/de.tutao.tutanota.txt b/metadata/de.tutao.tutanota.txt
index fa7a2f634b..7571d391dd 100644
--- a/metadata/de.tutao.tutanota.txt
+++ b/metadata/de.tutao.tutanota.txt
@@ -40,7 +40,21 @@ Build:3.36.1,336010
         npm install && \
         node dist prod
 
+Build:3.36.4,336040
+    commit=tutanota-android-release-3.36.4
+    subdir=app-android/app
+    sudo=curl -Lo node.tar.xz https://nodejs.org/dist/v8.11.3/node-v8.11.3-linux-x64.tar.xz && \
+        echo "08e2fcfea66746bd966ea3a89f26851f1238d96f86c33eaf6274f67fce58421a node.tar.xz" | sha256sum -c - && \
+        tar xJf node.tar.xz && \
+        cp -a node-v8.11.3-linux-x64/. /usr/local/
+    gradle=yes
+    prebuild=cd ../.. && \
+        rm -rf app-ios && \
+        sed -i '/flow-bin/d' package.json && \
+        npm install && \
+        node dist prod
+
 Auto Update Mode:Version tutanota-android-release-%v
 Update Check Mode:Tags tutanota-android-release-*
-Current Version:3.36.1
-Current Version Code:336010
+Current Version:3.36.4
+Current Version Code:336040
diff --git a/metadata/de.westnordost.streetcomplete.txt b/metadata/de.westnordost.streetcomplete.txt
index 44006a4e19..ed5dff5320 100644
--- a/metadata/de.westnordost.streetcomplete.txt
+++ b/metadata/de.westnordost.streetcomplete.txt
@@ -216,8 +216,13 @@ Build:7.0,701
     subdir=app
     gradle=yes
 
+Build:7.1,702
+    commit=v7.1
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Update Check Ignore:(alpha|beta|rc|RC)
-Current Version:7.0
-Current Version Code:701
+Current Version:7.1
+Current Version Code:702
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
new file mode 100644
index 0000000000..db296d2fb7
--- /dev/null
+++ b/metadata/eu.faircode.email.yml
@@ -0,0 +1,79 @@
+Categories:
+  - Internet
+License: GPL-3.0-only
+AuthorName: Marcel Bokhorst (M66B)
+WebSite: https://email.faircode.eu/
+SourceCode: https://github.com/M66B/open-source-email
+IssueTracker: https://github.com/M66B/open-source-email/issues
+Changelog: https://github.com/M66B/open-source-email/releases
+Donate: https://email.faircode.eu/pro/
+Bitcoin: 13nUbfsLUzK9Sr7ZJgDRHNR91BJMuDuJnf
+
+AutoName: FairEmail
+Summary: Privacy friendly email app
+Description: |-
+    This email app might be for you if your current email app:
+    * takes long to receive or show messages
+    * can manage only one mailbox
+    * cannot show related messages
+    * cannot work offline
+    * looks outdated
+    * is not maintained
+    * stores your email on their servers
+    * is closed source, potentially violating your privacy
+
+    '''Features'''
+    * 100 % open source
+    * Multiple accounts (inboxes)
+    * Multiple identities (outboxes)
+    * Unified inbox
+    * Distraction free reading and writing
+    * Message threading
+    * Two way synchronization
+    * Offline storage and operations
+    * Material design
+    * Dark theme
+
+    '''Pro features'''
+    * Preview sender/subject in new messages status bar notification
+    * Encrypt/decrypt messages using OpenPGP via [[org.sufficientlysecure.keychain]]
+    * Search on server
+    * Standard answers
+
+    '''Simple'''
+    * Easy navigation
+    * No settings
+    * No bells and whistles
+
+    '''Secure'''
+    * Allow encrypted connections only
+    * Accept valid security certificates only
+    * SMTP authentication required
+    * Text view only (converted HTML)
+    * No special permissions required
+    * No advertisements
+    * No analytics and no tracking
+
+    '''Efficient'''
+    * IMAP IDLE supported
+    * Built with latest development tools and libraries
+    * Android 6 Marshmallow or later required
+
+    This app starts a foreground service with a low priority status bar
+    notification to make sure you'll never miss new email.
+
+RepoType: git
+Repo: https://github.com/M66B/open-source-email
+
+Builds:
+  - versionName: '0.32'
+    versionCode: 32
+    commit: '0.32'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '0.32'
+CurrentVersionCode: 32
diff --git a/metadata/eu.quelltext.mundraub.txt b/metadata/eu.quelltext.mundraub.txt
index 9b9ccfe464..67bc434c2a 100644
--- a/metadata/eu.quelltext.mundraub.txt
+++ b/metadata/eu.quelltext.mundraub.txt
@@ -37,7 +37,12 @@ Build:1.22,23
     subdir=app
     gradle=yes
 
+Build:1.26,27
+    commit=v1.26
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:1.22
-Current Version Code:23
+Current Version:1.26
+Current Version Code:27
diff --git a/metadata/fr.byped.bwarearea.txt b/metadata/fr.byped.bwarearea.txt
index bab2e191f0..2bf1fb9b79 100644
--- a/metadata/fr.byped.bwarearea.txt
+++ b/metadata/fr.byped.bwarearea.txt
@@ -28,7 +28,12 @@ Build:0.6.2,1
     subdir=app
     gradle=yes
 
+Build:0.6.5,3
+    commit=v0.6.5
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:0.6.2
-Current Version Code:1
+Current Version:0.6.5
+Current Version Code:3
diff --git a/metadata/info.zamojski.soft.towercollector.yml b/metadata/info.zamojski.soft.towercollector.yml
index b19ffbc03c..200fca3371 100644
--- a/metadata/info.zamojski.soft.towercollector.yml
+++ b/metadata/info.zamojski.soft.towercollector.yml
@@ -63,7 +63,7 @@ Builds:
     gradle:
       - productionFdroid
 
-  - versionName: 1.22.0
+  - versionName: 1.22.0-fdroid
     versionCode: 1220027
     commit: 1.22.0
     subdir: app
@@ -72,5 +72,5 @@ Builds:
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: 1.22.0
+CurrentVersion: 1.22.0-fdroid
 CurrentVersionCode: 1220027
diff --git a/metadata/io.mrarm.irc.txt b/metadata/io.mrarm.irc.txt
index bb1f9d3f35..a27bf68a3b 100644
--- a/metadata/io.mrarm.irc.txt
+++ b/metadata/io.mrarm.irc.txt
@@ -38,7 +38,12 @@ Build:0.3.2,5
     subdir=app
     gradle=yes
 
+Build:0.4.1,7
+    commit=0.4.1
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.3.2
-Current Version Code:5
+Current Version:0.4.1
+Current Version Code:7
diff --git a/metadata/org.coolreader.txt b/metadata/org.coolreader.txt
index 49f3b759ff..70e5ca6dab 100644
--- a/metadata/org.coolreader.txt
+++ b/metadata/org.coolreader.txt
@@ -365,6 +365,7 @@ Build:3.2.9-1,2091
     rm=android/build.properties
     prebuild=sed -i -e 's/^APP_ABI\s*:=.*/APP_ABI := all/' jni/Application.mk
     scanignore=cr3wx
+    ndk=r16b
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/org.xphnx.ameixamonochrome.txt b/metadata/org.xphnx.ameixamonochrome.txt
index ed7568c6e4..f18f04534c 100644
--- a/metadata/org.xphnx.ameixamonochrome.txt
+++ b/metadata/org.xphnx.ameixamonochrome.txt
@@ -34,12 +34,7 @@ Build:3.1.4,54
     subdir=app
     gradle=yes
 
-Build:4.0.0,58
-    commit=v4.0.0
-    subdir=app
-    gradle=yes
-
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:4.0.0
-Current Version Code:58
+Current Version:3.1.4
+Current Version Code:54
diff --git a/metadata/pt.ipleiria.mymusicqoe.txt b/metadata/pt.ipleiria.mymusicqoe.txt
index df21bfac37..6a18361803 100644
--- a/metadata/pt.ipleiria.mymusicqoe.txt
+++ b/metadata/pt.ipleiria.mymusicqoe.txt
@@ -45,7 +45,12 @@ Build:1.2.0,10
     subdir=ultrasonic
     gradle=yes
 
+Build:1.3.0,11
+    commit=v1.3.0
+    subdir=ultrasonic
+    gradle=yes
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:1.2.0
-Current Version Code:10
+Current Version:1.3.0
+Current Version Code:11
diff --git a/metadata/saschpe.contactevents.txt b/metadata/saschpe.contactevents.txt
index 968eb2f164..100c846a2c 100644
--- a/metadata/saschpe.contactevents.txt
+++ b/metadata/saschpe.contactevents.txt
@@ -1,6 +1,6 @@
 Categories:System
 License:GPL-3.0-only
-Web Site:https://play.google.com/store/apps/details?id=saschpe.contactevents
+Web Site:https://sites.google.com/view/birthday-calendar/
 Source Code:https://github.com/saschpe/BirthdayCalendar
 Issue Tracker:https://github.com/saschpe/BirthdayCalendar/issues
 
diff --git a/metadata/taco.apkmirror.yml b/metadata/taco.apkmirror.yml
new file mode 100644
index 0000000000..f43aa625c9
--- /dev/null
+++ b/metadata/taco.apkmirror.yml
@@ -0,0 +1,47 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Internet
+  - System
+License: GPL-2.0-or-later
+WebSite: https://gitlab.com/TacoTheDank/APKMirror
+SourceCode: https://gitlab.com/TacoTheDank/APKMirror
+IssueTracker: https://gitlab.com/TacoTheDank/APKMirror/issues
+
+AutoName: APKMirror
+Summary: An unofficial APKMirror client/web app
+Description: |-
+    An app to browse APKMirror from a device from an app that browses APKMirror
+    and only APKMirror as APKMirror only has apks (which are only used for
+    Android devices), and is the sole purpose of this app existing (because who
+    uses browsers amirite), so it only browses APKMirror, as an app.
+
+    Features
+
+    * Quick loading (for the most part)
+    * Choose any download manager
+    * Clean material design (I think)
+    * Small-ish APK size
+
+    Things that constitute as Anti-Features
+
+    * The app itself does NOT contain any ads whatsoever. However, as anyone who has visited the APKMirror site probably knows, they do display ads. As this app utilizes WebView, the site's ads will also end up being displayed in the app.
+
+RepoType: git
+Repo: https://gitlab.com/TacoTheDank/APKMirror
+
+Builds:
+  - versionName: 1.0.4
+    versionCode: 5
+    commit: 1.0.4
+    subdir: app
+    gradle:
+      - yes
+    output: build/outputs/apk/fdroid/release/app-fdroid-release-unsigned.apk
+    prebuild: |-
+        sed -i -e 's/4\.10\-rc\-2/4\.9/' ../gradle/wrapper/gradle-wrapper.properties
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 1.0.4
+CurrentVersionCode: 5
diff --git a/stats/categories.txt b/stats/categories.txt
index d816b03fa7..e6bee011b7 100644
--- a/stats/categories.txt
+++ b/stats/categories.txt
@@ -10,7 +10,7 @@ Time 141
 Theming 139
 Development 133
 Connectivity 129
-Security 123
+Security 124
 Money 68
 Phone & SMS 67
 Sports & Health 65
diff --git a/stats/known_apks.txt b/stats/known_apks.txt
index 829db1a454..004b0e30cb 100644
--- a/stats/known_apks.txt
+++ b/stats/known_apks.txt
@@ -3474,6 +3474,7 @@ com.github.axet.torrentclient_635.apk com.github.axet.torrentclient 2018-06-02
 com.github.axet.torrentclient_643.apk com.github.axet.torrentclient 2018-06-20
 com.github.axet.torrentclient_644.apk com.github.axet.torrentclient 2018-06-21
 com.github.axet.torrentclient_645.apk com.github.axet.torrentclient 2018-07-15
+com.github.axet.torrentclient_651.apk com.github.axet.torrentclient 2018-08-29
 com.github.cetoolbox_1.apk com.github.cetoolbox 2013-12-09
 com.github.cythara_1.apk com.github.cythara 2017-08-23
 com.github.cythara_2.apk com.github.cythara 2017-08-26
@@ -6131,6 +6132,7 @@ com.quaap.bookymcbookface_32.apk com.quaap.bookymcbookface 2018-04-10
 com.quaap.bookymcbookface_34.apk com.quaap.bookymcbookface 2018-07-08
 com.quaap.bookymcbookface_35.apk com.quaap.bookymcbookface 2018-07-19
 com.quaap.bookymcbookface_40.apk com.quaap.bookymcbookface 2018-08-01
+com.quaap.bookymcbookface_410.apk com.quaap.bookymcbookface 2018-08-29
 com.quaap.computationaldemonology_1.apk com.quaap.computationaldemonology 2016-12-21
 com.quaap.dodatheexploda_1.apk com.quaap.dodatheexploda 2017-03-29
 com.quaap.dodatheexploda_2.apk com.quaap.dodatheexploda 2017-07-02
@@ -7215,6 +7217,7 @@ com.termux.api_22.apk com.termux.api 2018-06-07
 com.termux.api_24.apk com.termux.api 2018-06-16
 com.termux.api_25.apk com.termux.api 2018-06-25
 com.termux.api_26.apk com.termux.api 2018-07-28
+com.termux.api_27.apk com.termux.api 2018-08-29
 com.termux.boot_2.apk com.termux.boot 2017-09-02
 com.termux.boot_3.apk com.termux.boot 2017-12-04
 com.termux.boot_4.apk com.termux.boot 2017-12-04
@@ -7231,6 +7234,7 @@ com.termux.styling_18.apk com.termux.styling 2017-08-20
 com.termux.styling_19.apk com.termux.styling 2017-08-20
 com.termux.styling_20.apk com.termux.styling 2017-12-04
 com.termux.styling_21.apk com.termux.styling 2017-12-04
+com.termux.styling_23.apk com.termux.styling 2018-08-29
 com.termux.tasker_1.apk com.termux.tasker 2016-12-30
 com.termux.tasker_2.apk com.termux.tasker 2017-09-24
 com.termux.tasker_3.apk com.termux.tasker 2017-12-04
@@ -7334,6 +7338,7 @@ com.tmendes.birthdaydroid_24.apk com.tmendes.birthdaydroid 2018-08-03
 com.tmendes.birthdaydroid_25.apk com.tmendes.birthdaydroid 2018-08-09
 com.tmendes.birthdaydroid_26.apk com.tmendes.birthdaydroid 2018-08-15
 com.tmendes.birthdaydroid_27.apk com.tmendes.birthdaydroid 2018-08-26
+com.tmendes.birthdaydroid_28.apk com.tmendes.birthdaydroid 2018-08-29
 com.tmendes.dadosd_4.apk com.tmendes.dadosd 2017-02-24
 com.tobiaskuban.android.monthcalendarwidgetfoss_4.apk com.tobiaskuban.android.monthcalendarwidgetfoss 2014-03-27
 com.tobiaskuban.android.monthcalendarwidgetfoss_5.apk com.tobiaskuban.android.monthcalendarwidgetfoss 2015-03-07
@@ -7862,6 +7867,7 @@ com.workingagenda.fissure_3.apk com.workingagenda.fissure 2016-08-25
 com.workingagenda.fissure_5.apk com.workingagenda.fissure 2016-09-22
 com.wownero.wownerujo_1060.apk com.wownero.wownerujo 2018-08-20
 com.wownero.wownerujo_1070.apk com.wownero.wownerujo 2018-08-20
+com.wownero.wownerujo_1080.apk com.wownero.wownerujo 2018-08-29
 com.write.Quill_36.apk com.write.Quill 2012-09-18
 com.write.Quill_37.apk com.write.Quill 2012-11-01
 com.write.Quill_40.apk com.write.Quill 2013-07-02
@@ -10119,6 +10125,7 @@ de.westnordost.streetcomplete_503.apk de.westnordost.streetcomplete 2018-05-03
 de.westnordost.streetcomplete_504.apk de.westnordost.streetcomplete 2018-05-07
 de.westnordost.streetcomplete_602.apk de.westnordost.streetcomplete 2018-07-06
 de.westnordost.streetcomplete_603.apk de.westnordost.streetcomplete 2018-07-19
+de.westnordost.streetcomplete_701.apk de.westnordost.streetcomplete 2018-08-29
 de.wikilab.android.friendica01_8.apk de.wikilab.android.friendica01 2013-01-18
 de.wikilab.android.friendica01_9.apk de.wikilab.android.friendica01 2013-06-02
 de.xskat_14.apk de.xskat 2016-10-04
@@ -10541,6 +10548,7 @@ eu.quelltext.mundraub_1.apk eu.quelltext.mundraub 2018-08-20
 eu.quelltext.mundraub_9.apk eu.quelltext.mundraub 2018-08-24
 eu.quelltext.mundraub_14.apk eu.quelltext.mundraub 2018-08-26
 eu.quelltext.mundraub_19.apk eu.quelltext.mundraub 2018-08-27
+eu.quelltext.mundraub_23.apk eu.quelltext.mundraub 2018-08-29
 eu.siacs.conversations.legacy_255.apk eu.siacs.conversations.legacy 2018-03-31
 eu.siacs.conversations.legacy_256.apk eu.siacs.conversations.legacy 2018-05-03
 eu.siacs.conversations.voicerecorder_2.apk eu.siacs.conversations.voicerecorder 2016-01-04
@@ -11575,6 +11583,7 @@ info.metadude.android.congress.schedule_40.apk info.metadude.android.congress.sc
 info.metadude.android.congress.schedule_41.apk info.metadude.android.congress.schedule 2017-12-24
 info.metadude.android.congress.schedule_43.apk info.metadude.android.congress.schedule 2018-01-03
 info.metadude.android.congress.schedule_44.apk info.metadude.android.congress.schedule 2018-01-03
+info.metadude.android.congress.schedule_46.apk info.metadude.android.congress.schedule 2018-08-29
 info.papdt.blackblub_4.apk info.papdt.blackblub 2016-03-22
 info.papdt.blackblub_5.apk info.papdt.blackblub 2016-04-04
 info.papdt.blackblub_6.apk info.papdt.blackblub 2017-01-17
@@ -12344,6 +12353,7 @@ me.echeung.moemoekyun.fdroid_62.apk me.echeung.moemoekyun.fdroid 2018-08-14
 me.echeung.moemoekyun.fdroid_63.apk me.echeung.moemoekyun.fdroid 2018-08-21
 me.echeung.moemoekyun.fdroid_64.apk me.echeung.moemoekyun.fdroid 2018-08-24
 me.echeung.moemoekyun.fdroid_65.apk me.echeung.moemoekyun.fdroid 2018-08-27
+me.echeung.moemoekyun.fdroid_66.apk me.echeung.moemoekyun.fdroid 2018-08-29
 me.guillaumin.android.osmtracker_20.apk me.guillaumin.android.osmtracker 2011-07-03
 me.guillaumin.android.osmtracker_21.apk me.guillaumin.android.osmtracker 2011-10-02
 me.guillaumin.android.osmtracker_22.apk me.guillaumin.android.osmtracker 2012-02-05
@@ -12615,6 +12625,7 @@ net.androgames.level_36.apk net.androgames.level 2014-09-17
 net.androidcomics.acv_46.apk net.androidcomics.acv 2013-04-22
 net.anzix.osm.upload_10.apk net.anzix.osm.upload 2013-07-08
 net.artificialworlds.rabbitescape_103.apk net.artificialworlds.rabbitescape 2017-01-30
+net.artificialworlds.rabbitescape_110.apk net.artificialworlds.rabbitescape 2018-08-29
 net.asceai.meritous_1.apk net.asceai.meritous 2013-01-02
 net.asceai.meritous_2.apk net.asceai.meritous 2013-01-15
 net.avs234_16.apk net.avs234 2013-03-12
@@ -12845,6 +12856,7 @@ net.gsantner.markor_22.apk net.gsantner.markor 2018-05-21
 net.gsantner.markor_23.apk net.gsantner.markor 2018-05-29
 net.gsantner.markor_24.apk net.gsantner.markor 2018-06-12
 net.gsantner.markor_25.apk net.gsantner.markor 2018-08-14
+net.gsantner.markor_27.apk net.gsantner.markor 2018-08-29
 net.haltcondition.anode_7.apk net.haltcondition.anode 2014-08-09
 net.healeys.lexic_41.apk net.healeys.lexic 2012-02-09
 net.i2p.android.router_0.apk net.i2p.android.router 2013-10-30
@@ -13514,6 +13526,7 @@ nl.implode.regenalarm_40300.apk nl.implode.regenalarm 2017-06-13
 nl.implode.regenalarm_40301.apk nl.implode.regenalarm 2017-07-18
 nl.implode.weer_10.apk nl.implode.weer 2018-08-10
 nl.implode.weer_11.apk nl.implode.weer 2018-08-12
+nl.implode.weer_12.apk nl.implode.weer 2018-08-29
 nl.mpcjanssen.simpletask_1053.apk nl.mpcjanssen.simpletask 2013-12-04
 nl.mpcjanssen.simpletask_1054.apk nl.mpcjanssen.simpletask 2013-12-07
 nl.mpcjanssen.simpletask_1058.apk nl.mpcjanssen.simpletask 2013-12-11
@@ -16730,6 +16743,7 @@ org.petero.droidfish_71.apk org.petero.droidfish 2016-11-03
 org.petero.droidfish_72.apk org.petero.droidfish 2016-12-25
 org.petero.droidfish_74.apk org.petero.droidfish 2017-01-04
 org.petero.droidfish_75.apk org.petero.droidfish 2017-02-03
+org.pipoypipagames.cowsrevenge_6.apk org.pipoypipagames.cowsrevenge 2018-08-29
 org.pixmob.freemobile.netstat_53.apk org.pixmob.freemobile.netstat 2015-12-30
 org.pixmob.freemobile.netstat_61.apk org.pixmob.freemobile.netstat 2016-03-20
 org.pixmob.freemobile.netstat_62.apk org.pixmob.freemobile.netstat 2016-03-22
@@ -17364,6 +17378,7 @@ org.proninyaroslav.libretorrent_5.apk org.proninyaroslav.libretorrent 2017-07-14
 org.proninyaroslav.libretorrent_6.apk org.proninyaroslav.libretorrent 2017-12-07
 org.proninyaroslav.libretorrent_7.apk org.proninyaroslav.libretorrent 2018-02-03
 org.proninyaroslav.libretorrent_8.apk org.proninyaroslav.libretorrent 2018-04-17
+org.proninyaroslav.libretorrent_9.apk org.proninyaroslav.libretorrent 2018-08-29
 org.pulpdust.lesserpad_6.apk org.pulpdust.lesserpad 2013-03-22
 org.pulpdust.lesserpad_7.apk org.pulpdust.lesserpad 2013-05-04
 org.pulpdust.lesserpad_8.apk org.pulpdust.lesserpad 2013-06-19
@@ -19221,11 +19236,13 @@ protect.videoeditor_9.apk protect.videoeditor 2018-05-22
 protect.videoeditor_10.apk protect.videoeditor 2018-06-16
 protect.videoeditor_11.apk protect.videoeditor 2018-06-28
 protect.videoeditor_12.apk protect.videoeditor 2018-08-15
+protect.videoeditor_13.apk protect.videoeditor 2018-08-29
 pt.ipleiria.mymusicqoe_3.apk pt.ipleiria.mymusicqoe 2018-08-10
 pt.ipleiria.mymusicqoe_5.apk pt.ipleiria.mymusicqoe 2018-08-14
 pt.ipleiria.mymusicqoe_7.apk pt.ipleiria.mymusicqoe 2018-08-21
 pt.ipleiria.mymusicqoe_8.apk pt.ipleiria.mymusicqoe 2018-08-21
 pt.ipleiria.mymusicqoe_9.apk pt.ipleiria.mymusicqoe 2018-08-24
+pt.ipleiria.mymusicqoe_10.apk pt.ipleiria.mymusicqoe 2018-08-29
 pt.isec.tp.am_2.apk pt.isec.tp.am 2012-02-27
 pt.isec.tp.am_4.apk pt.isec.tp.am 2012-03-10
 pt.joaomneto.titancompanion_60.apk pt.joaomneto.titancompanion 2018-06-02
@@ -19471,6 +19488,7 @@ ryey.easer_80.apk ryey.easer 2018-07-15
 ryey.easer_81.apk ryey.easer 2018-07-19
 ryey.easer_82.apk ryey.easer 2018-07-25
 ryey.easer_83.apk ryey.easer 2018-08-09
+ryey.easer_84.apk ryey.easer 2018-08-29
 ryey.flock_4.apk ryey.flock 2016-08-02
 ryey.flock_6.apk ryey.flock 2016-08-06
 ryey.flock_8.apk ryey.flock 2017-03-29
diff --git a/stats/latestapps.txt b/stats/latestapps.txt
index e8272b2046..e2f2d28700 100644
--- a/stats/latestapps.txt
+++ b/stats/latestapps.txt
@@ -1,3 +1,4 @@
+org.pipoypipagames.cowsrevenge
 com.gmail.jiwopene.temperature
 ru.henridellal.patolli
 de.lisas.alex.runuserinit
@@ -7,4 +8,3 @@ de.perflyst.untis
 negativedensity.techahashi
 eu.quelltext.mundraub
 dev.dworks.apps.anexplorer.pro
-d.d.meshenger
diff --git a/stats/licenses.txt b/stats/licenses.txt
index 8e88d455e1..5e6c6206ab 100644
--- a/stats/licenses.txt
+++ b/stats/licenses.txt
@@ -8,7 +8,7 @@ BSD-3-Clause 42
 AGPL-3.0-only 29
 MPL-2.0 23
 LGPL-3.0-only 17
-WTFPL 15
+WTFPL 16
 AGPL-3.0-or-later 14
 BSD-2-Clause-FreeBSD 14
 PublicDomain 12
diff --git a/stats/repotypes.txt b/stats/repotypes.txt
index cd19a730ff..1a47ac928c 100644
--- a/stats/repotypes.txt
+++ b/stats/repotypes.txt
@@ -1,4 +1,4 @@
-git 2501
+git 2502
 git-svn 104
 none 62
 hg 46
diff --git a/stats/update_check_modes.txt b/stats/update_check_modes.txt
index a4a0e231c3..df98c7335a 100644
--- a/stats/update_check_modes.txt
+++ b/stats/update_check_modes.txt
@@ -1,4 +1,4 @@
-Tags 1474
+Tags 1475
 RepoManifest 789
 Static 236
 None 217
diff --git a/tools/check-keyalias-collision.py b/tools/check-keyalias-collision.py
new file mode 100755
index 0000000000..7c93e37083
--- /dev/null
+++ b/tools/check-keyalias-collision.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+
+import glob
+import hashlib
+import inspect
+import os
+import sys
+
+def generate_keyalias(s):
+    m = hashlib.md5()
+    m.update(s.encode())
+    return m.hexdigest()[:8]
+
+base = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+metadatafiles = sorted(glob.glob(base + '/metadata/*.txt')
+                       + glob.glob(base + '/metadata/*.yml'))
+
+if not metadatafiles:
+    print('No metadata files found!')
+    sys.exit(1)
+
+keyaliases = dict()
+for f in metadatafiles:
+    appid = os.path.basename(f)[:-4]
+    keyalias = generate_keyalias(appid)
+    if keyalias in keyaliases:
+        print(appid, "keyalias conflicts with", keyaliases[keyalias])
+        sys.exit(1)
+    keyaliases[keyalias] = appid