diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml
index fd57d642b5..6b52ca2737 100644
--- a/metadata/com.tutpro.baresip.yml
+++ b/metadata/com.tutpro.baresip.yml
@@ -2001,10 +2001,31 @@ Builds:
       - popd
     ndk: r23
 
+  - versionName: 36.0.0
+    versionCode: 183
+    commit: 46122285dc809e53b48c72ddbd6c675b7ff6b6a6
+    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    srclibs:
+      - libbaresip-android@22.0
+    build:
+      - pushd $$libbaresip-android$$
+      - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e
+        's|/usr/src/baresip-studio|../../com.tutpro.baresip|' Makefile
+      - make download-sources
+      - make install-all
+      - popd
+    ndk: r21e
+
 MaintainerNotes: make download-sources checks out master branches of several libraries;
     this can cause build failures.
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^[0-9.]+$
-CurrentVersion: 35.2.0
-CurrentVersionCode: 182
+CurrentVersion: 36.0.0
+CurrentVersionCode: 183