diff --git a/build-package.sh b/build-package.sh
index b1deea4f5..8bbdd995e 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -557,7 +557,7 @@ termux_step_start_build() {
 	TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_COMMON_CACHEDIR/${TERMUX_NDK_VERSION}-${TERMUX_ARCH}-${TERMUX_PKG_API_LEVEL}"
 	# Bump the below version if a change is made in toolchain setup to ensure
 	# that everyone gets an updated toolchain:
-	TERMUX_STANDALONE_TOOLCHAIN+="-v4"
+	TERMUX_STANDALONE_TOOLCHAIN+="-v1"
 
 	if [ -n "${TERMUX_PKG_BLACKLISTED_ARCHES:=""}" ] && [ "$TERMUX_PKG_BLACKLISTED_ARCHES" != "${TERMUX_PKG_BLACKLISTED_ARCHES/$TERMUX_ARCH/}" ]; then
 		echo "Skipping building $TERMUX_PKG_NAME for arch $TERMUX_ARCH"
@@ -930,6 +930,7 @@ termux_step_setup_toolchain() {
 				https://raw.githubusercontent.com/madler/zlib/v1.2.8/$file
 		done
 		unset file
+		grep -lrw $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/c++/v1 -e '<version>'   | xargs -n 1 sed -i 's/<version>/\"version\"/g'
 		mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN
 	fi
 
diff --git a/packages/libjasper/build.sh b/packages/libjasper/build.sh
index 28b4498bc..e51827814 100644
--- a/packages/libjasper/build.sh
+++ b/packages/libjasper/build.sh
@@ -9,3 +9,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -H$TERMUX_PKG_SRCDIR
 -B$TERMUX_PKG_BUILDDIR
 "
+termux_step_pre_configure() {
+	LDFLAGS+=" -lm"
+}
diff --git a/packages/ndk-multilib/build.sh b/packages/ndk-multilib/build.sh
index a0ac9dbca..822d75628 100644
--- a/packages/ndk-multilib/build.sh
+++ b/packages/ndk-multilib/build.sh
@@ -2,7 +2,6 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
 TERMUX_PKG_DESCRIPTION="Multilib binaries for cross-compilation"
 TERMUX_PKG_LICENSE="NCSA"
 TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
-TERMUX_PKG_REVISION=3
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh
index 2fab55775..233e65ff2 100644
--- a/packages/ndk-sysroot/build.sh
+++ b/packages/ndk-sysroot/build.sh
@@ -31,7 +31,6 @@ termux_step_extract_into_massagedir() {
 
 	local LIBGCC_PATH=$TERMUX_STANDALONE_TOOLCHAIN/lib/gcc/$TERMUX_HOST_PLATFORM/4.9.x
 	if [ $TERMUX_ARCH = "arm" ]; then LIBGCC_PATH+="/armv7-a"; fi
-	#LIBGCC_PATH+="/libgcc.a"
 	cp $LIBGCC_PATH/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/
 	
 	cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libcompiler_rt-extras.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/
diff --git a/packages/valgrind/build.sh b/packages/valgrind/build.sh
index db0325071..22e1e34d9 100644
--- a/packages/valgrind/build.sh
+++ b/packages/valgrind/build.sh
@@ -16,6 +16,7 @@ termux_step_pre_configure() {
 	if [ "$TERMUX_ARCH" == "aarch64" ]; then
 		cp $TERMUX_PKG_BUILDER_DIR/aarch64-setjmp.S $TERMUX_PKG_SRCDIR
 		autoreconf -if
+		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-only64bit"
 	fi
 	if [ "$TERMUX_ARCH" == "arm" ]; then
 		# valgrind doesn't like arm; armv7 works, though.
diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh
index 34e476f8b..318957148 100755
--- a/scripts/setup-android-sdk.sh
+++ b/scripts/setup-android-sdk.sh
@@ -6,8 +6,8 @@ set -e -u
 
 ANDROID_SDK_FILE=sdk-tools-linux-4333796.zip
 ANDROID_SDK_SHA256=92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
-ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-Linux-x86_64.zip
-ANDROID_NDK_SHA256=c0a2425206191252197b97ea5fcc7eab9f693a576e69ef4773a9ed1690feed53
+ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}b-Linux-x86_64.zip
+ANDROID_NDK_SHA256=0fbb1645d0f1de4dde90a4ff79ca5ec4899c835e729d692f433fda501623257a
 
 if [ ! -d $ANDROID_HOME ]; then
 	mkdir -p $ANDROID_HOME