diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml
index c0d7ad596e..08d9645e19 100644
--- a/metadata/org.atalk.android.yml
+++ b/metadata/org.atalk.android.yml
@@ -105,7 +105,49 @@ Builds:
       - mv jni/static_library_built/openssl/output/android/ jni/openssl/
     ndk: r15c
 
+  - versionName: 1.8.7
+    versionCode: 1087
+    commit: 1.8.7
+    subdir: aTalk/
+    gradle:
+      - fdroid
+    srclibs:
+      - fmj@r122
+      - jitsi-zrtp4j@7cbd8101108191089aad871002567c2a0eb2b512
+    rm:
+      - aTalk/lib/src_reference/*/*.jar
+      - aTalk/lib/bundles/*.jar
+      - aTalk/jni/ffmpeg/android/
+      - aTalk/jni/openssl/android/
+      - aTalk/jni/vpx/android/
+    prebuild: sed -i -e "/clean.dependsOn 'ndkClean'/d" build.gradle
+    build:
+      - pushd $$fmj$$
+      - ant
+      - popd
+      - pushd $$jitsi-zrtp4j$$
+      - ant jar
+      - popd
+      - mv $$fmj$$/build/jars/fmj.jar lib/bundles/fmj-1.0-SNAPSHOT.jar
+      - mv $$jitsi-zrtp4j$$/dist/zrtp4j-light.jar lib/bundles/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar
+      - pushd jni/static_library_built/ffmpeg-x264/
+      - ./init_update_libs.sh
+      - ./ffmpeg-atalk_build.sh
+      - popd
+      - mv jni/static_library_built/ffmpeg-x264/android/ jni/ffmpeg/
+      - pushd jni/static_library_built/libvpx/
+      - ./init_libvpx.sh
+      - ./build-libvpx4android.sh
+      - popd
+      - mv jni/static_library_built/libvpx/output/android/ jni/vpx/
+      - pushd jni/static_library_built/openssl/
+      - ./init_libopenssl.sh
+      - ./build-openssl4android.sh
+      - popd
+      - mv jni/static_library_built/openssl/output/android/ jni/openssl/
+    ndk: r15c
+
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: 1.8.5
-CurrentVersionCode: 1085
+CurrentVersion: 1.8.7
+CurrentVersionCode: 1087