diff --git a/metadata/com.adonai.manman.txt b/metadata/com.adonai.manman.txt
index 4e2d777647..5c8bb4853e 100644
--- a/metadata/com.adonai.manman.txt
+++ b/metadata/com.adonai.manman.txt
@@ -32,6 +32,12 @@ Build:1.0.2 Beta,102
     subdir=app
     gradle=yes
 
+Build:1.2.0,120
+    commit=1.2.0
+    subdir=app
+    gradle=yes
+    prebuild=sed -i -e 's/v4:21.0.2/v4:21.0.+/g' build.gradle
+
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:1.2.0
diff --git a/metadata/com.github.notizklotz.derbunddownloader.txt b/metadata/com.github.notizklotz.derbunddownloader.txt
new file mode 100644
index 0000000000..03e6496319
--- /dev/null
+++ b/metadata/com.github.notizklotz.derbunddownloader.txt
@@ -0,0 +1,28 @@
+AntiFeatures:NonFreeNet
+Categories:Reading
+License:GPLv3
+Web Site:https://github.com/notizklotz/derbund-downloader/blob/HEAD/README.md
+Source Code:https://github.com/notizklotz/derbund-downloader
+Issue Tracker:https://github.com/notizklotz/derbund-downloader/issues
+
+Auto Name:Der Bund ePaper Downloader
+Summary:Download ePaper issue of the Der Bund
+Description:
+[http://epaper.derbund.ch/ Der Bund] is a swiss newspaper, which offers
+an ePaper version.
+.
+
+Repo Type:git
+Repo:https://github.com/notizklotz/derbund-downloader
+
+Build:1.1.1,11
+    commit=v1.1.1
+    subdir=app
+    gradle=yes
+    prebuild=sed -i -e 's/v4:21.0.2/v4:21.0.+/g' build.gradle ../build.gradle
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.1.1
+Current Version Code:11
+
diff --git a/metadata/com.github.ooz.heymeditation.txt b/metadata/com.github.ooz.heymeditation.txt
index b2e88241e1..4a7f42e829 100644
--- a/metadata/com.github.ooz.heymeditation.txt
+++ b/metadata/com.github.ooz.heymeditation.txt
@@ -26,8 +26,14 @@ Build:1.0.1,2
     srclibs=1:appcompat@v7
     extlibs=android/android-support-v4.jar
 
-Auto Update Mode:None
-Update Check Mode:RepoManifest
+Build:1.1,3
+    commit=v1.1
+    rm=libs/*
+    srclibs=1:appcompat@v7
+    extlibs=android/android-support-v4.jar
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
 Current Version:1.1
 Current Version Code:3
 
diff --git a/metadata/com.isanexusdev.androidcpg.txt b/metadata/com.isanexusdev.androidcpg.txt
index 81f941ff97..b5c6d3bd25 100644
--- a/metadata/com.isanexusdev.androidcpg.txt
+++ b/metadata/com.isanexusdev.androidcpg.txt
@@ -20,6 +20,10 @@ Build:1.1,2
     commit=1dc066fc9e61
     subdir=Android
 
+Build:1.2,3
+    commit=c708b217d607
+    subdir=Android
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:1.2
diff --git a/metadata/com.smithdtyler.prettygoodmusicplayer.txt b/metadata/com.smithdtyler.prettygoodmusicplayer.txt
index 788bb65c19..8b92a41f41 100644
--- a/metadata/com.smithdtyler.prettygoodmusicplayer.txt
+++ b/metadata/com.smithdtyler.prettygoodmusicplayer.txt
@@ -36,6 +36,9 @@ Build:2.2.2,18
 Build:2.2.5,21
     commit=f488dd7cb65c5aae9f5c788ba20a029d44220355
 
+Build:2.2.7,26
+    commit=fafac3ee9eeda7aa113cf9577fadc49317faa3b3
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:2.2.7
diff --git a/metadata/de.guerda.matekarte.txt b/metadata/de.guerda.matekarte.txt
new file mode 100644
index 0000000000..6225842250
--- /dev/null
+++ b/metadata/de.guerda.matekarte.txt
@@ -0,0 +1,24 @@
+Categories:Office
+License:GPLv3
+Source Code:https://github.com/guerda/Matekarte
+Issue Tracker:https://github.com/guerda/Matekarte/issues
+
+Auto Name:Matekarte
+Summary:Find retailers for Mate drink in Germany
+Description:
+Client for [https://www.matekarte.de/ Matekarte], which shows
+you locations of nearby dealers for Yerba Mate.
+.
+
+Repo Type:git
+Repo:https://github.com/guerda/Matekarte
+
+Build:1.0,1
+    commit=77f23a9b9aec03b5d6d1f92d746569bfd22c874d
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/de.k3b.android.toGoZip.txt b/metadata/de.k3b.android.toGoZip.txt
index 54a1f59af3..84e693bf91 100644
--- a/metadata/de.k3b.android.toGoZip.txt
+++ b/metadata/de.k3b.android.toGoZip.txt
@@ -32,6 +32,11 @@ Build:0.2.2.20141120,2
     subdir=app
     gradle=yes
 
+Build:0.2.4.20141126,4
+    commit=aeac661a8352b00d1068853e8ad31c70569089f2
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:0.2.4.20141126
diff --git a/metadata/fr.masciulli.drinks.txt b/metadata/fr.masciulli.drinks.txt
new file mode 100644
index 0000000000..1307d8b887
--- /dev/null
+++ b/metadata/fr.masciulli.drinks.txt
@@ -0,0 +1,26 @@
+Categories:Office
+License:Apache2
+Web Site:https://github.com/amasciul/Drinks/blob/HEAD/README.md
+Source Code:https://github.com/amasciul/Drinks
+Issue Tracker:https://github.com/amasciul/Drinks/issues
+
+Auto Name:Drinks
+Summary:Search and display cocktail recipes
+Description:
+Helps you to make cocktails. You can search by name or ingredient.
+.
+
+Repo Type:git
+Repo:https://github.com/amasciul/Drinks
+
+Build:1.2.1,18
+    commit=v1.2.1
+    subdir=Drinks
+    gradle=yes
+    prebuild=sed -i -e 's/v7:21.0.2/v7:21.0.+/g' build.gradle ../build.gradle ../android-quantizer/build.gradle
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:1.2.1
+Current Version Code:18
+
diff --git a/metadata/fr.pssoftware.monescarcelle.txt b/metadata/fr.pssoftware.monescarcelle.txt
index 5dab25d397..575c17d0bf 100644
--- a/metadata/fr.pssoftware.monescarcelle.txt
+++ b/metadata/fr.pssoftware.monescarcelle.txt
@@ -23,8 +23,18 @@ Build:1.8,18
     rm=MonEscarcelle/libs/*
     prebuild=cp -fR $$AChartengineXlythe$$/src/org src/
 
-Auto Update Mode:None
-Update Check Mode:RepoManifest
+Build:2.0,20
+    disable=wrong version of achartengine 
+    commit=20
+    subdir=app
+    gradle=yes
+    rm=app/libs/*
+    srclibs=AChartengineXlythe@0b27908f012ba17360977f8b87c64e755948302c
+    prebuild=cp -fR $$AChartengineXlythe$$/src/org src/main/java/ && \
+         sed -i -e '/achartengine/d' -e 's/v4:21.0.2/v4:21.0.+/g' build.gradle
+
+#Auto Update Mode:Version %c
+Update Check Mode:Tags
 Current Version:1.8
 Current Version Code:18
 
diff --git a/metadata/fr.pssoftware.scoretarot.txt b/metadata/fr.pssoftware.scoretarot.txt
index 2e2d9da2c5..83997d042b 100644
--- a/metadata/fr.pssoftware.scoretarot.txt
+++ b/metadata/fr.pssoftware.scoretarot.txt
@@ -22,8 +22,17 @@ Build:1.4,14
     prebuild=cp -fR $$AChartengineXlythe$$/src/org src/ && \
         cp -fR libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
 
-Auto Update Mode:None
-Update Check Mode:RepoManifest
+Build:2.0,20
+    commit=20
+    subdir=app
+    gradle=yes
+    rm=app/libs/*
+    srclibs=AChartengineXlythe@0b27908f012ba17360977f8b87c64e755948302c
+    prebuild=cp -fR $$AChartengineXlythe$$/src/org src/main/java/ && \
+         sed -i -e '/achartengine/d' build.gradle
+
+Auto Update Mode:Version %c
+Update Check Mode:Tags
 Current Version:2.0
 Current Version Code:20
 
diff --git a/metadata/fr.ybo.transportsbordeaux.txt b/metadata/fr.ybo.transportsbordeaux.txt
index ccbd7ba1a7..0a710b2b8b 100644
--- a/metadata/fr.ybo.transportsbordeaux.txt
+++ b/metadata/fr.ybo.transportsbordeaux.txt
@@ -107,6 +107,14 @@ Build:2.8.8,288
     rm=TransportsBordeaux/libs/GoogleAdMobAdsSdk*.jar
     prebuild=cp -R $$MobAdMob$$/src/com/ src/
 
+#Build:2.9.0,290
+#    commit=TB_noGoogleMap_2.9.0
+#    subdir=TransportsBordeaux
+#    gradle=yes
+#    srclibs=MobAdMob@2d5736
+#    rm=TransportsBordeaux/libs/GoogleAdMobAdsSdk*.jar
+#    prebuild=cp -R $$MobAdMob$$/src/com/ src/
+
 # && pushd $$OpenTripPlaner$$ && $$MVN3$$ install && popd
 Maintainer Notes:
 Replace jar files! (see fr.ybo.transportsrennes)
diff --git a/metadata/net.ebt.muzei.miyazaki.txt b/metadata/net.ebt.muzei.miyazaki.txt
index 7fa9a70bbb..ec0967b71e 100644
--- a/metadata/net.ebt.muzei.miyazaki.txt
+++ b/metadata/net.ebt.muzei.miyazaki.txt
@@ -31,6 +31,13 @@ Build:1.0.5,14
     rm=app/libs/*jar
     prebuild=cp -fR $$MuzeiAPI$$/api/src/main/java/com src/main/java/
 
+Build:2.1,123
+    commit=2.1
+    subdir=app
+    gradle=yes
+    rm=app/libs/*jar
+    disable=okio problems
+
 Maintainer Notes:
 Switch back to gradle's "compile 'com.google.android.apps.muzei:muzei-api:+'"
 once -master fixes are available via central.
diff --git a/metadata/org.mozilla.mozstumbler.txt b/metadata/org.mozilla.mozstumbler.txt
index 50c61e0937..5eaf371fdc 100644
--- a/metadata/org.mozilla.mozstumbler.txt
+++ b/metadata/org.mozilla.mozstumbler.txt
@@ -118,10 +118,16 @@ Build:1.5.0,1050000
     gradle=fdroid
     prebuild=sed -i -e '/sonatype/d' build.gradle ../build.gradle
 
+Build:1.5.1,1050100
+    commit=030d2f583ecf6440fa470930535b76e838a085be
+    subdir=android
+    gradle=fdroid
+    prebuild=sed -i -e '/sonatype/d' build.gradle ../build.gradle
+
 Maintainer Notes:
 Update check is broken.
 .
 
 Update Check Mode:None
-Current Version:1.5.0
-Current Version Code:1050000
+Current Version:1.5.1
+Current Version Code:1050100
diff --git a/metadata/org.projectmaxs.main.txt b/metadata/org.projectmaxs.main.txt
index 665a4e23ea..430964245d 100644
--- a/metadata/org.projectmaxs.main.txt
+++ b/metadata/org.projectmaxs.main.txt
@@ -14,6 +14,7 @@ MAXS (Modular Android XMPP Service) allows you to receive
 notifications and remote control your Android device over XMPP. You
 will need at least one transport component and one module besides MAXS
 main in order to make use of MAXS.
+'''Make sure to launch Maxs Main once before installing other MAXS components!'''
 .
 
 Repo Type:srclib