diff --git a/metadata/security.pEp.txt b/metadata/security.pEp.txt
index 743135af9e..ff92a5a39f 100644
--- a/metadata/security.pEp.txt
+++ b/metadata/security.pEp.txt
@@ -42,30 +42,21 @@ Just install the app and you can communicate in confidence with your peers.
 Repo Type:git
 Repo:https://letsencrypt.pep-security.lu/gitlab/android/pep.git
 
-# sed -i "s:.. -I../include:-I$(srcdir)/.. -I${ANDROID_NDK}/sysroot/usr/include/ -I${ANDROID_NDK}/sysroot/usr/include/arm-linux-androideabi/ -I../include:" $$pEpJNIAdapter$$/android/external/libiconv/libcharset/lib/Makefile && \
-# sed -i 's:\(ICONV_PREFIX=$(LOCAL)\) \(./build.sh\):\1 bash \2:' $$pEpJNIAdapter$$/android/external/Makefile && \
-# sed -i 's:include $(ANDROID_NDK_HOME)/\(toolchains/$(NDK_TOOLCHAIN)/setup.mk\):include $(ANDROID_NDK_HOME)/build/core/\1:' $$pEpJNIAdapter$$/android/external/Makefile && \
-
-# -I$(NDK_SYSROOT)/usr/include -I$(NDK_SYSYROOT)/usr/include/$(HOST)
-
-# sed -i -re 's:(libiconv/lib/.libs/libiconv.so\: libiconv/Makefile):\tsed -i "s\:_GL_WARN_ON_USE\:// _GL_WARN_ON_USE\:" libiconv/srclib/stdio.h\n\n\1:' $$pEpJNIAdapter$$/android/external/Makefile && \
-
-Build:v1.0.100rc1,2
+Build:1.0.100rc1.withoutKeysync,2
     commit=v1.0.100rc1
     subdir=k9mail
     gradle=WithoutkeysyncPlayStore
-    srclibs=pEpJNIAdapter@83285bacb44c,pEpEngine@5ca43900bc58,yml2@2.5.7
-    prebuild=sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):' ../settings.gradle && \
-        sed -i "s/4.8/4.9/" $$pEpJNIAdapter$$/android/external/Makefile $$pEpJNIAdapter$$/android/jni/Application.mk $$pEpEngine$$/build-android/jni/Application.mk && \
-        sed -i 's:DANDROID:DANDROID -I$(ANDROID_NDK_HOME)/sysroot/usr/include -I$(ANDROID_NDK_HOME)/sysroot/usr/include/$(HOST):' $$pEpJNIAdapter$$/android/external/Makefile && \
+    srclibs=pEpJNIAdapter@cb23e18e4b88,pEpEngine@5ca43900bc58,yml2@2.5.5
+    prebuild=rm -vf src/main/res/xml/changelog_master.xml && \
+        sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):' ../settings.gradle && \
+		sed -i 's:YML2_PATH=.*$:YML2_PATH=../$$yml2$$:' $$pEpEngine$$/default.conf && \
         sed -i "s:yml2proc:../$$yml2$$/yml2proc:" $$pEpJNIAdapter$$/src/Makefile && \
         sed -i 's:env python:env python2:' $$yml2$$/yml2proc && \
         sed -i "s:backend.includePath.extend(dirs):backend.includePath.extend(['$(realpath $$yml2$$)']):" $$yml2$$/yml2proc && \
-        sed -i 's:YML2_PATH=.*$:YML2_PATH=../$$yml2$$:' $$pEpEngine$$/default.conf && \
-        sed -i "s:/bin/sh:/bin/bash:" $$pEpEngine$$/build-android/build.sh && \
+        sed -i 's:YML2PROC=.*$:YML2PROC=../$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=../$$yml2$$:' $$pEpEngine$$/Makefile.conf && \
         sed -i 's:ASN1C_INCLUDE=.*$:ASN1C_INCLUDE=/usr/share/asn1c:' $$pEpEngine$$/Makefile.conf && \
         sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
-    ndk=r12b
+    ndk=r14b
 
 Maintainer Notes:
 Do not set AUM when srclibs tend to change!
@@ -77,14 +68,3 @@ Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:v1.0.100rc1
 Current Version Code:2
-
-# srclibs=pEpJNIAdapter@2ec9da619371,pEpEngine@5ca43900bc58,yml2@2.5.5
-# prebuild=sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):' ../settings.gradle && \
-# sed -i "s:yml2proc:../$$yml2$$/yml2proc:" $$pEpJNIAdapter$$/src/Makefile && \
-# sed -i 's:env python:env python2:' $$yml2$$/yml2proc && \
-# sed -i "s:backend.includePath.extend(dirs):backend.includePath.extend(['$(realpath $$yml2$$)']):" $$yml2$$/yml2proc && \
-# sed -i 's:YML2PROC=.*$:YML2PROC=../$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=../$$yml2$$:' $$pEpEngine$$/Makefile.conf && \
-# sed -i 's:ASN1C_INCLUDE=.*$:ASN1C_INCLUDE=/usr/share/asn1c:' $$pEpEngine$$/Makefile.conf && \
-# sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
-# ndk=r14b
-# Update Check Mode: