diff --git a/metadata/org.openbmap.txt b/metadata/org.openbmap.txt
index af8cf41016..b17654e4a7 100644
--- a/metadata/org.openbmap.txt
+++ b/metadata/org.openbmap.txt
@@ -70,7 +70,7 @@ Build:0.8.4,12
     prebuild=sed -i -e 's/0.4.3/0.5.0-rc1/g' -e '/svg-android/d' build.gradle
 
 Build:0.8.5,13
-    disable=res already defined
+    disable=res issues
     commit=6065846cbfcb
     subdir=android/app
     gradle=yes
@@ -79,7 +79,7 @@ Build:0.8.5,13
         rm ../local.properties
 
 Build:0.8.6,14
-    disable=remove apk
+    disable=res issues
     commit=v0.8.6
     subdir=android/app
     gradle=yes
@@ -87,8 +87,18 @@ Build:0.8.6,14
     prebuild=sed -i -e '/jar/d' -e 's/minSdkVersion 8/minSdkVersion 9/g' -e '/support-v4/acompile "com.caverock:androidsvg:1.2.1"\ncompile "org.apache.commons:commons-lang3:3.4"\ncompile "org.apache.httpcomponents:httpmime:4.2.3"\ncompile "com.jjoe64:graphview:3.1.3"\ncompile "org.mapsforge:mapsforge-core:0.5.1"\ncompile "org.mapsforge:mapsforge-map:0.5.1"\ncompile "org.mapsforge:mapsforge-map-reader:0.5.1"\ncompile "org.mapsforge:mapsforge-map-android:0.5.1"' build.gradle && \
         rm ../local.properties
 
+Build:0.8.7,15
+    disable=res/R issues
+    commit=1fde62ddb832
+    subdir=android/app
+    gradle=yes
+    rm=android/app/libs/*.jar
+    prebuild=sed -i -e 's/minSdkVersion 8/minSdkVersion 9/g' -e 's/v7:19/v7:22/g' -e 's/1+/1/g' build.gradle && \
+        rm ../local.properties
+
+Auto Update Mode:None
 #Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:0.8.6
-Current Version Code:14
+Current Version:0.8.7
+Current Version Code:15