diff --git a/metadata/com.freerdp.afreerdp.yml b/metadata/com.freerdp.afreerdp.yml
index c708d8591c..f789d5d30b 100644
--- a/metadata/com.freerdp.afreerdp.yml
+++ b/metadata/com.freerdp.afreerdp.yml
@@ -126,6 +126,28 @@ Builds:
       - popd
     ndk: r21d
 
+  - versionName: 2.3.1
+    versionCode: 21
+    commit: 2.3.1
+    subdir: client/Android/Studio/aFreeRDP
+    gradle:
+      - yes
+    prebuild:
+      - $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
+      - pushd ../../../../scripts
+      - sed -i -e 's/OPENSSL_TAG=OpenSSL_1_1_[0-1][a-h]/OPENSSL_TAG=OpenSSL_1_1_1j/'
+        -e 's/WITH_OPENH264=0/WITH_OPENH264=1/' -e 's/NDK_TARGET=14/NDK_TARGET=21/'
+        android-build-*.conf
+    build:
+      - pushd ../../../../scripts
+      - export ANDROID_NDK=$$NDK$$
+      - export ANDROID_SDK=$$SDK$$
+      - export ANDROID_NDK_OPENH264=$$NDK$$/../*r15c
+      - ./android-build-freerdp.sh --conf android-build-32.conf
+      - ./android-build-freerdp.sh --conf android-build-64.conf
+      - popd
+    ndk: r21d
+
 MaintainerNotes: |-
     * Keep OpenH264 at 1.8.0 as the newer versions have issues with reference frames and
       the H264 data sent by microsoft RDP servers.
@@ -136,5 +158,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.2.0
-CurrentVersionCode: 19
+CurrentVersion: 2.3.1
+CurrentVersionCode: 21