diff --git a/root-packages/frida-server/Makefile.linux.mk.patch b/root-packages/frida-server/Makefile.linux.mk.patch
deleted file mode 100644
index 1bb289cca..000000000
--- a/root-packages/frida-server/Makefile.linux.mk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../Makefile.linux.mk.orig	2019-01-20 12:10:09.986612435 +0000
-+++ ./Makefile.linux.mk	2019-01-20 12:45:07.956597217 +0000
-@@ -401,7 +401,7 @@
- server-armhf: build/frida-linux-armhf/lib/pkgconfig/frida-core-1.0.pc ##@server Build for arm
- server-mips: build/frida-linux-mips/lib/pkgconfig/frida-core-1.0.pc ##@server Build for mips
- server-mipsel: build/frida-linux-mipsel/lib/pkgconfig/frida-core-1.0.pc ##@server Build for mipsel
--server-android: build/frida-android-x86/lib/pkgconfig/frida-core-1.0.pc build/frida-android-x86_64/lib/pkgconfig/frida-core-1.0.pc build/frida-android-arm/lib/pkgconfig/frida-core-1.0.pc build/frida-android-arm64/lib/pkgconfig/frida-core-1.0.pc ##@server Build for Android all supported architectures
-+server-android: build/frida-android-@TERMUX_ARCH@/lib/pkgconfig/frida-core-1.0.pc ##@server Build for Android all supported architectures
- server-android-arm: build/frida-android-arm/lib/pkgconfig/frida-core-1.0.pc build/frida-android-arm64/lib/pkgconfig/frida-core-1.0.pc ##@server Build for Android arm and arm64 only
- server-qnx-arm: build/frida-qnx-arm/lib/pkgconfig/frida-core-1.0.pc ##@server Build for QNX-arm
- server-qnx-armeabi: build/frida-qnx-armeabi/lib/pkgconfig/frida-core-1.0.pc ##@server Build for QNX-armeabi
diff --git a/root-packages/frida-server/build.sh b/root-packages/frida-server/build.sh
index 61ddf11e8..f2e6cbec3 100644
--- a/root-packages/frida-server/build.sh
+++ b/root-packages/frida-server/build.sh
@@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.frida.re/
 TERMUX_PKG_DESCRIPTION="Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers"
 TERMUX_PKG_LICENSE="wxWindows"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
-TERMUX_PKG_VERSION=12.4.0
-TERMUX_PKG_REVISION=1
+_MAJOR_VERSION=12
+_MINOR_VERSION=5
+_MICRO_VERSION=6
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION}.${_MICRO_VERSION}
 TERMUX_PKG_SRCURL=https://github.com/frida/frida.git
 TERMUX_PKG_DEPENDS="libiconv"
 TERMUX_PKG_BUILD_IN_SRC=yes
@@ -38,6 +40,14 @@ termux_step_host_build () {
 	tar -xf ${TERMUX_PKG_CACHEDIR}/node-v${node_version}-linux-x64.tar.xz --strip-components=1
 }
 
+termux_step_post_configure () {
+	# frida-version.h is normally generated from git and the commits.
+	sed -i "s/@TERMUX_PKG_VERSION@/$TERMUX_PKG_VERSION/g" ${TERMUX_PKG_SRCDIR}/build/frida-version.h
+	sed -i "s/@_MAJOR_VERSION@/$_MAJOR_VERSION/g" ${TERMUX_PKG_SRCDIR}/build/frida-version.h
+	sed -i "s/@_MINOR_VERSION@/$_MINOR_VERSION/g" ${TERMUX_PKG_SRCDIR}/build/frida-version.h
+	sed -i "s/@_MICRO_VERSION@/$_MICRO_VERSION/g" ${TERMUX_PKG_SRCDIR}/build/frida-version.h
+}
+
 termux_step_make () {
 	if [[ ${TERMUX_ARCH} == "aarch64" ]]; then
 		arch=arm64
@@ -46,9 +56,7 @@ termux_step_make () {
 	else
 		arch=${TERMUX_ARCH}
 	fi
-	# Build only for desired architecture:
-	sed -i "s/@TERMUX_ARCH@/$arch/g" ${TERMUX_PKG_SRCDIR}/Makefile.linux.mk
-	PATH=${TERMUX_PKG_HOSTBUILD_DIR}/bin:$PATH make server-android ${TERMUX_PKG_EXTRA_MAKE_ARGS}
+	PATH=${TERMUX_PKG_HOSTBUILD_DIR}/bin:$PATH make core-android-${arch} ${TERMUX_PKG_EXTRA_MAKE_ARGS}
 }
 
 termux_step_make_install () {
diff --git a/root-packages/frida-server/setup-env.sh.patch b/root-packages/frida-server/setup-env.sh.patch
index f3a23ebf4..89dc12c9c 100644
--- a/root-packages/frida-server/setup-env.sh.patch
+++ b/root-packages/frida-server/setup-env.sh.patch
@@ -1,5 +1,5 @@
---- ../setup-env.sh.orig	2019-03-04 22:56:56.693240356 +0100
-+++ ./releng/setup-env.sh	2019-03-04 22:57:18.379906864 +0100
+--- ./releng/setup-env.sh.orig	2019-05-19 08:35:29.686650174 +0200
++++ ./releng/setup-env.sh	2019-05-19 08:41:29.746647583 +0200
 @@ -97,8 +97,8 @@
  fi
  
@@ -11,21 +11,33 @@
    if [ -n "$ANDROID_NDK_ROOT" ]; then
      if [ -f "$ANDROID_NDK_ROOT/source.properties" ]; then
        ndk_installed_version=$(grep Pkg.Revision "$ANDROID_NDK_ROOT/source.properties" | awk '{ print $NF; }')
-@@ -414,7 +414,7 @@
+@@ -465,25 +465,25 @@
  
      case $host_arch in
        x86)
--        android_api=14
-+        android_api=21
+-        android_api=18
++        android_api=24
          host_triplet="i686-linux-android"
          host_arch_flags="-march=i686"
          host_ldflags="-fuse-ld=gold"
-@@ -426,7 +426,7 @@
-         host_ldflags="-fuse-ld=gold"
+         ;;
+       x86_64)
+-        android_api=21
++        android_api=24
+         host_triplet="x86_64-linux-android"
+         host_arch_flags=""
+         host_ldflags="-fuse-ld=gold -Wl,--icf=all"
          ;;
        arm)
--        android_api=14
-+        android_api=21
+-        android_api=18
++        android_api=24
          host_triplet="arm-linux-androideabi"
          host_arch_flags="-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16"
-         host_ldflags="-fuse-ld=gold -Wl,--fix-cortex-a8 -Wl,--icf=safe"
+         host_ldflags="-fuse-ld=gold -Wl,--icf=all -Wl,--fix-cortex-a8"
+         ;;
+       arm64)
+-        android_api=21
++        android_api=24
+         host_triplet="aarch64-linux-android"
+         host_arch_flags=""
+         host_ldflags="-fuse-ld=gold -Wl,--icf=all"