diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ab6ce180..3c915b232 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
     branches: [master]
 
-# Cancel old PR builds when pushing new commits.
+# Cancel old builds when pushing new commits.
 concurrency:
   group: build-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 000000000..779033d0b
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,131 @@
+---
+  name: deploy
+
+  on:
+    push:
+      branches: [master]
+    pull_request:
+      branches: [master]
+
+  # Cancel old builds when pushing new commits.
+  concurrency:
+    group: deploy-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
+
+  jobs:
+    linux:
+      name: Linux
+      strategy:
+        matrix:
+          arch: [aarch64, x86_64]
+      runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
+      steps:
+        - name: Checkout code
+          uses: actions/checkout@v4
+        - name: Cache built binaries
+          id: cache
+          uses: actions/cache@v4
+          with:
+            path: |
+              _build
+              _git
+              _install
+            key: ${{ github.job }}-${{ matrix.arch }}
+        - name: Install dependencies
+          if: steps.cache.outputs.cache-hit != 'true'
+          run: sudo apt-get update && sudo apt-get install -y --no-install-recommends
+            yasm
+        - name: Build binaries
+          run: |
+            if [ -d _install/host ]; then
+              echo "Not rebuilding dependencies"
+              touch _install/host/.stamp
+              touch _install/host/*.stamp
+            fi
+            scripts/build-host -j "$(nproc)" \
+              lib/src/main/cpp/ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h \
+              lib/src/main/cpp/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h \
+              lib/src/main/cpp/ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h
+        - name: Build host tools tarball
+          run: tar -zcf _install/host.tar.gz _install/host
+        - name: Upload artifact
+          uses: actions/upload-artifact@v4
+          with:
+            name: ${{ github.job }}-${{ matrix.arch }}
+            path: _install/host.tar.gz
+            if-no-files-found: error
+
+    android:
+      name: Android
+      needs: [linux]
+      strategy:
+        matrix:
+          abi: [arm64-v8a, armeabi-v7a, x86_64, x86]
+      runs-on: ubuntu-24.04
+      steps:
+        - name: Checkout code
+          uses: actions/checkout@v4
+        - name: Download artifact
+          uses: actions/download-artifact@v4
+          with:
+            name: linux-x86_64
+        - name: Extract artifact
+          run: |
+            tar -zxf host.tar.gz
+            rm host.tar.gz
+        - name: Cache built binaries
+          id: cache
+          uses: actions/cache@v4
+          with:
+            path: |
+              _git
+              _install
+            key: ${{ github.job }}-${{ matrix.abi }}
+        - name: Install dependencies
+          if: steps.cache.outputs.cache-hit != 'true'
+          run: sudo apt-get update && sudo apt-get install -y --no-install-recommends
+            yasm
+        - name: Build Android JNI
+          run: |
+            if [ -d _install/*android* ]; then
+              echo "Not rebuilding dependencies"
+              touch _install/*android*/.stamp
+              touch _install/*android*/*.stamp
+            fi
+            scripts/build-android.sh ${{ matrix.abi }} -j "$(nproc)"
+
+    macos:
+      name: macOS
+      strategy:
+        matrix:
+          arch: [arm64, x86_64]
+      runs-on: ${{ matrix.arch == 'x86_64' && 'macos-13' || 'macos-14' }}
+      steps:
+        - name: Checkout code
+          uses: actions/checkout@v4
+        - name: Cache built binaries
+          id: cache
+          uses: actions/cache@v4
+          with:
+            path: |
+              _build
+              _git
+              _install
+            key: ${{ github.job }}-${{ matrix.arch }}
+        - name: Install dependencies
+          if: steps.cache.outputs.cache-hit != 'true'
+          run: brew install autoconf automake libtool yasm
+        - name: Build binaries
+          run: |
+            if [ -d _install/host ]; then
+              echo "Not rebuilding dependencies"
+              touch _install/host/.stamp
+              touch _install/host/*.stamp
+            fi
+            scripts/build-host -j "$(sysctl -n hw.logicalcpu)"
+        - name: Upload artifact
+          uses: actions/upload-artifact@v4
+          with:
+            name: ${{ github.job }}-${{ matrix.arch }}
+            path: _install/host
+            if-no-files-found: error
diff --git a/scripts/android.mk b/scripts/android.mk
index f94e4a50c..71298ab7c 100644
--- a/scripts/android.mk
+++ b/scripts/android.mk
@@ -9,18 +9,21 @@ PROTOC		:= $(DESTDIR)/host/bin/protoc
 
 export CC		:= $(TOOLCHAIN)/bin/$(TARGET)$(NDK_API)-clang
 export CXX		:= $(TOOLCHAIN)/bin/$(TARGET)$(NDK_API)-clang++
-export LDFLAGS		:= -llog
 export PKG_CONFIG_LIBDIR:= $(PREFIX)/lib/pkgconfig
 export PKG_CONFIG_PATH	:= $(PREFIX)/lib/pkgconfig
 export PATH		:= $(TOOLCHAIN)/bin:$(PATH)
 export TOX4J_PLATFORM	:= $(TARGET)
 
-protobuf_CONFIGURE	:= --prefix=$(PREFIX) --host=$(TARGET) --with-sysroot=$(SYSROOT) --disable-shared --with-protoc=$(PROTOC)
-libsodium_CONFIGURE	:= --prefix=$(PREFIX) --host=$(TARGET) --with-sysroot=$(SYSROOT) --disable-shared
-opus_CONFIGURE		:= --prefix=$(PREFIX) --host=$(TARGET) --with-sysroot=$(SYSROOT) --disable-shared
-libvpx_CONFIGURE	:= --prefix=$(PREFIX) --sdk-path=$(NDK_HOME) --libc=$(SYSROOT) --target=$(VPX_ARCH) --disable-examples --disable-unit-tests --enable-pic
-toxcore_CONFIGURE	:= -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX) -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -DANDROID_CPU_FEATURES=$(NDK_HOME)/sources/android/cpufeatures/cpu-features.c -DENABLE_STATIC=ON -DENABLE_SHARED=OFF
-tox4j_CONFIGURE		:= -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX) -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -DANDROID_CPU_FEATURES=$(NDK_HOME)/sources/android/cpufeatures/cpu-features.c
+protobuf_CONFIGURE	:= -D CMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -D WITH_PROTOC=$(PROTOC) -D CMAKE_EXE_LINKER_FLAGS=-llog
+libsodium_CONFIGURE	:= --host=$(TARGET) --with-sysroot=$(SYSROOT)
+opus_CONFIGURE		:= --host=$(TARGET) --with-sysroot=$(SYSROOT)
+libvpx_CONFIGURE	:= --libc=$(SYSROOT) --target=$(VPX_ARCH)
+toxcore_CONFIGURE	:= -D CMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -D ANDROID_CPU_FEATURES=$(NDK_HOME)/sources/android/cpufeatures/cpu-features.c
+tox4j_CONFIGURE		:= -D CMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -D ANDROID_CPU_FEATURES=$(NDK_HOME)/sources/android/cpufeatures/cpu-features.c -D protobuf_DIR=$(PREFIX)/lib/cmake/protobuf -D absl_DIR=$(PREFIX)/lib/cmake/absl -D utf8_range_DIR=$(PREFIX)/lib/cmake/utf8_range
+
+libvpx_PATCH	:=							\
+	sed -i -e 's!^AS=as!AS=$(CC) -c!' $(BUILDDIR)/libvpx/*.mk &&	\
+	sed -i -e 's!^STRIP=strip!STRIP=$(TOOLCHAIN)/bin/llvm-strip!' $(BUILDDIR)/libvpx/*.mk
 
 build: $(PREFIX)/tox4j.stamp
 
@@ -31,10 +34,9 @@ $(NDK_HOME):
 	@$(PRE_RULE)
 	@mkdir -p $(@D)
 	# This is put into the root dir, not into $(SRCDIR), because it's huge and
-	# clutters the Travis CI cache.
+	# clutters the CI cache.
 	test -f $(NDK_PACKAGE) || curl -s $(NDK_URL) -o $(NDK_PACKAGE)
-	7z x $(NDK_PACKAGE) $(foreach x,$(NDK_FILES),'-ir!$(NDK_DIR)/$x')
-	test -d $@ && find $@ -exec chmod +w {} \; && rm -rf $@
+	$(SEVEN_ZIP) x -snld $(NDK_PACKAGE)
 	mv $(NDK_DIR) $@
 	mkdir -p $(TOOLCHAIN)/bin
 	ln -f $(CC) $(TOOLCHAIN)/bin/$(TARGET)-gcc
diff --git a/scripts/build-aarch64-linux-android b/scripts/build-aarch64-linux-android
index 5b7d3c2dd..ae01c3c05 100755
--- a/scripts/build-aarch64-linux-android
+++ b/scripts/build-aarch64-linux-android
@@ -4,15 +4,7 @@ TARGET := aarch64-linux-android
 
 include scripts/common.mk
 
-NDK_FILES := $(NDK_COMMON_FILES)						\
-	platforms/android-21/arch-arm64						\
-	toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android		\
-	toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-*	\
-	toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-*	\
-	toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21
-
 NDK_API := 21
-NDK_ARCH := arm64
 VPX_ARCH := arm64-android-gcc
 
 include scripts/android.mk
diff --git a/scripts/build-android.sh b/scripts/build-android.sh
new file mode 100755
index 000000000..2b54aee1b
--- /dev/null
+++ b/scripts/build-android.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+set -eux -o pipefail
+
+GIT_ROOT=$(git rev-parse --show-toplevel)
+cd "$GIT_ROOT"
+
+ABI=$1
+shift
+
+case $ABI in
+  arm64-v8a)
+    SCRIPT_ARCH=aarch64-linux-android
+    ;;
+  armeabi-v7a)
+    SCRIPT_ARCH=armv7a-linux-androideabi
+    ;;
+  x86)
+    SCRIPT_ARCH=i686-linux-android
+    ;;
+  x86_64)
+    SCRIPT_ARCH=x86_64-linux-android
+    ;;
+  *)
+    echo "Unknown ABI: $ABI"
+    exit 1
+    ;;
+esac
+
+"scripts/build-$SCRIPT_ARCH" libvpx "$@"
+"scripts/build-$SCRIPT_ARCH" "$@"
diff --git a/scripts/build-arm-linux-androideabi b/scripts/build-arm-linux-androideabi
deleted file mode 100755
index d0b75cce3..000000000
--- a/scripts/build-arm-linux-androideabi
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/make -f
-
-TARGET := arm-linux-androideabi
-
-include scripts/common.mk
-
-NDK_FILES := $(NDK_COMMON_FILES)			\
-	platforms/android-9				\
-	sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi*	\
-	toolchains/arm-linux-androideabi-4.9
-
-NDK_API := 9
-NDK_ARCH := arm
-VPX_ARCH := armv7-android-gcc
-
-include scripts/android.mk
-include scripts/dependencies.mk
diff --git a/scripts/build-armv7a-linux-androideabi b/scripts/build-armv7a-linux-androideabi
new file mode 100755
index 000000000..acc59a35d
--- /dev/null
+++ b/scripts/build-armv7a-linux-androideabi
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+TARGET := armv7a-linux-androideabi
+
+include scripts/common.mk
+
+NDK_API := 21
+VPX_ARCH := armv7-android-gcc
+
+include scripts/android.mk
+include scripts/dependencies.mk
diff --git a/scripts/build-host b/scripts/build-host
index 833f8c49b..c66661974 100755
--- a/scripts/build-host
+++ b/scripts/build-host
@@ -9,42 +9,40 @@ TOOLCHAIN	:= $(DESTDIR)/$(TARGET)
 TOOLCHAIN_FILE	:= $(TOOLCHAIN)/.stamp
 PREFIX		:= $(TOOLCHAIN)
 
-export CC		:= $(shell which clang || which gcc)
-export CXX		:= $(shell which clang++ || which g++)
-export PKG_CONFIG_PATH	:= $(PREFIX)/lib/pkgconfig
-export TOX4J_PLATFORM	:= $(shell perl -e 'print $$^O')-$(shell uname -m)
-export LD_LIBRARY_PATH	:= $(PREFIX)/lib
+export CC			:= $(shell which clang || which gcc)
+export CXX			:= $(shell which clang++ || which g++)
+export PKG_CONFIG_PATH		:= $(PREFIX)/lib/pkgconfig
+export TOX4J_PLATFORM		:= $(shell perl -e 'print $$^O')-$(shell uname -m)
+export LD_LIBRARY_PATH		:= $(PREFIX)/lib
+export DYLD_LIBRARY_PATH	:= $(PREFIX)/lib
 
 build: $(PREFIX)/tox4j.stamp
 	./gradlew build
 
-test: build
-	$(MAKE) -C _build/$(TARGET)/tox4j test
-	$(MAKE) -f scripts/build-host regenerate
-	git diff --exit-code
-	sbt -Djava.library.path=$(PREFIX)/lib "coverage" "test" "coverageReport"
+lib/src/main/cpp/ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h: build
+	find . -name "ToxAvJni.class"
+	# javah -cp $(PWD)/lib/build/classes/java/main im.tox.tox4j.impl.jni.ToxAvJni
+	# mv $(@F) $@
 
-cpp/src/ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h: build
-	javah -cp target/scala-2.11/classes im.tox.tox4j.impl.jni.ToxAvJni
-	mv $(@F) $@
+lib/src/main/cpp/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h: build
+	find . -name "ToxCoreJni.class"
+	# javah -cp $(PWD)/lib/build/classes/java/main im.tox.tox4j.impl.jni.ToxCoreJni
+	# mv $(@F) $@
 
-cpp/src/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h: build
-	javah -cp target/scala-2.11/classes im.tox.tox4j.impl.jni.ToxCoreJni
-	mv $(@F) $@
-
-cpp/src/ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h: build
-	javah -cp target/scala-2.11/classes im.tox.tox4j.impl.jni.ToxCryptoJni
-	mv $(@F) $@
+lib/src/main/cpp/ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h: build
+	find . -name "ToxCryptoJni.class"
+	# javah -cp $(PWD)/lib/build/classes/java/main im.tox.tox4j.impl.jni.ToxCryptoJni
+	# mv $(@F) $@
 
 %.run: ; $*
 regenerate: $(foreach i,$(wildcard bin/Jni*),$i.run) $(wildcard cpp/src/*/generated/*.h)
 
-protobuf_CONFIGURE	:= -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX) -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_DISABLE_RTTI=ON -Dprotobuf_BUILD_SHARED_LIBS=OFF
-libsodium_CONFIGURE	:= --prefix=$(PREFIX) --disable-shared
-opus_CONFIGURE		:= --prefix=$(PREFIX) --disable-shared
-libvpx_CONFIGURE	:= --prefix=$(PREFIX) --disable-examples --disable-unit-tests --enable-pic
-toxcore_CONFIGURE	:= -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX) -DENABLE_STATIC=ON -DENABLE_SHARED=OFF
-tox4j_CONFIGURE		:= -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX)
+protobuf_CONFIGURE	:=
+libsodium_CONFIGURE	:=
+opus_CONFIGURE		:=
+libvpx_CONFIGURE	:=
+toxcore_CONFIGURE	:=
+tox4j_CONFIGURE		:=
 
 $(TOOLCHAIN):
 	mkdir -p $@
diff --git a/scripts/build-i686-linux-android b/scripts/build-i686-linux-android
index 45036cefb..b15b91107 100755
--- a/scripts/build-i686-linux-android
+++ b/scripts/build-i686-linux-android
@@ -4,13 +4,7 @@ TARGET := i686-linux-android
 
 include scripts/common.mk
 
-NDK_FILES := $(NDK_COMMON_FILES)			\
-	platforms/android-9				\
-	sources/cxx-stl/gnu-libstdc++/4.9/libs/x86	\
-	toolchains/x86-4.9
-
-NDK_API := 9
-NDK_ARCH := x86
+NDK_API := 21
 VPX_ARCH := x86-android-gcc
 
 include scripts/android.mk
diff --git a/scripts/build-x86_64-linux-android b/scripts/build-x86_64-linux-android
index aaa1d378f..b32841034 100755
--- a/scripts/build-x86_64-linux-android
+++ b/scripts/build-x86_64-linux-android
@@ -4,13 +4,7 @@ TARGET := x86_64-linux-android
 
 include scripts/common.mk
 
-NDK_FILES := $(NDK_COMMON_FILES)			\
-	platforms/android-21				\
-	sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64	\
-	toolchains/x86_64-4.9
-
 NDK_API := 21
-NDK_ARCH := x86_64
 VPX_ARCH := x86_64-android-gcc
 
 include scripts/android.mk
diff --git a/scripts/common.mk b/scripts/common.mk
index 057fc43f2..ded1e782d 100644
--- a/scripts/common.mk
+++ b/scripts/common.mk
@@ -3,20 +3,18 @@ DESTDIR			:= $(CURDIR)/_install
 BUILDDIR		:= $(CURDIR)/_build/$(TARGET)
 
 export CFLAGS		:= -O3 -pipe
-export CXXFLAGS		:= -O3 -pipe
+export CXXFLAGS		:= -O3 -pipe -std=c++20
 export LDFLAGS		:=
 
 export PATH		:= $(DESTDIR)/host/bin:$(PATH)
 
 # Android NDK
-NDK_DIR		:= android-ndk-r21
-NDK_PACKAGE	:= $(NDK_DIR)-$(shell perl -e 'print $$^O')-x86_64.zip
+NDK_DIR		:= android-ndk-r27c
+ifeq ($(shell uname -s),Darwin)
+NDK_PACKAGE	:= $(NDK_DIR)-darwin.dmg
+SEVEN_ZIP	:= 7zz
+else
+NDK_PACKAGE	:= $(NDK_DIR)-linux.zip
+SEVEN_ZIP	:= 7z
+endif
 NDK_URL		:= http://dl.google.com/android/repository/$(NDK_PACKAGE)
-
-NDK_COMMON_FILES :=						\
-	sources/android/cpufeatures				\
-	toolchains/llvm/prebuilt/linux-x86_64/bin/clang		\
-	toolchains/llvm/prebuilt/linux-x86_64/bin/clang++	\
-	toolchains/llvm/prebuilt/linux-x86_64/lib/lib64		\
-	toolchains/llvm/prebuilt/linux-x86_64/lib64		\
-	toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include
diff --git a/scripts/dependencies.mk b/scripts/dependencies.mk
index bc2de0014..c2283487d 100644
--- a/scripts/dependencies.mk
+++ b/scripts/dependencies.mk
@@ -6,7 +6,7 @@ GIT_CLONE = git clone --depth=1 --recurse-submodules --shallow-submodules
 $(BUILDDIR)/tox4j/Makefile: $(CURDIR)/lib/src/main/cpp/CMakeLists.txt $(TOOLCHAIN_FILE) $(foreach i,protobuf toxcore,$(PREFIX)/$i.stamp)
 	@$(PRE_RULE)
 	mkdir -p $(@D)
-	cd $(@D) && cmake $(<D) $($(notdir $(@D))_CONFIGURE)
+	cd $(@D) && cmake $(<D) $($(notdir $(@D))_CONFIGURE) -D CMAKE_INSTALL_PREFIX=$(PREFIX)
 	@$(POST_RULE)
 
 $(PREFIX)/tox4j.stamp: $(BUILDDIR)/tox4j/Makefile
@@ -18,78 +18,74 @@ $(PREFIX)/tox4j.stamp: $(BUILDDIR)/tox4j/Makefile
 #############################################################################
 # protobuf
 
-$(SRCDIR)/protobuf:
-	$(GIT_CLONE) --branch=v3.24.4 https://github.com/protocolbuffers/protobuf $@
-
-$(PREFIX)/protobuf.stamp: $(SRCDIR)/protobuf $(TOOLCHAIN_FILE) $(PROTOC)
+protobuf: $(PREFIX)/protobuf.stamp
+$(PREFIX)/protobuf.stamp: $(TOOLCHAIN_FILE)
 	@$(PRE_RULE)
-	mkdir -p $(BUILDDIR)/$(notdir $<)
-	cd $(BUILDDIR)/$(notdir $<) && cmake $(SRCDIR)/$(notdir $<) $($(notdir $<)_CONFIGURE)
-	$(MAKE) -C $(BUILDDIR)/$(notdir $<) install
+	$(GIT_CLONE) --branch=v25.6 https://github.com/protocolbuffers/protobuf $(SRCDIR)/protobuf
+	mkdir -p $(BUILDDIR)/protobuf
+	cd $(BUILDDIR)/protobuf && cmake $(SRCDIR)/protobuf $(protobuf_CONFIGURE) -D CMAKE_INSTALL_PREFIX=$(PREFIX) -D BUILD_SHARED_LIBS=OFF -D protobuf_BUILD_TESTS=OFF -D protobuf_DISABLE_RTTI=ON -D protobuf_BUILD_SHARED_LIBS=OFF
+	$(MAKE) -C $(BUILDDIR)/protobuf install
 	mkdir -p $(@D) && touch $@
 	@$(POST_RULE)
 
 #############################################################################
 # toxcore
 
-$(SRCDIR)/toxcore:
-	if [ -e ../c-toxcore ]; then								\
-	  ln -s $(realpath ../c-toxcore) $@;							\
-	else											\
-	  $(GIT_CLONE) https://github.com/TokTok/c-toxcore $@;	\
-	fi
-
-$(PREFIX)/toxcore.stamp: $(foreach f,$(shell cd $(SRCDIR)/toxcore && git ls-files),$(SRCDIR)/toxcore/$f)
-$(PREFIX)/toxcore.stamp: $(SRCDIR)/toxcore $(TOOLCHAIN_FILE) $(foreach i,libsodium opus libvpx,$(PREFIX)/$i.stamp)
+toxcore: $(PREFIX)/toxcore.stamp
+$(PREFIX)/toxcore.stamp: $(TOOLCHAIN_FILE) $(foreach i,libsodium opus libvpx,$(PREFIX)/$i.stamp)
 	@$(PRE_RULE)
-	mkdir -p $(BUILDDIR)/$(notdir $<)
-	cd $(BUILDDIR)/$(notdir $<) && cmake $(SRCDIR)/$(notdir $<) $($(notdir $<)_CONFIGURE) -DMUST_BUILD_TOXAV=ON -DBOOTSTRAP_DAEMON=OFF
-	$(MAKE) -C $(BUILDDIR)/$(notdir $<) install
+	if [ -e $(SRCDIR)/toxcore ]; then					\
+	  echo "toxcore already linked/downloaded";				\
+	elif [ -e ../c-toxcore ]; then						\
+	  ln -s $(realpath ../c-toxcore) $@;					\
+	else									\
+	  $(GIT_CLONE) https://github.com/TokTok/c-toxcore $(SRCDIR)/toxcore;	\
+	fi
+	mkdir -p $(BUILDDIR)/toxcore
+	cd $(BUILDDIR)/toxcore && cmake $(SRCDIR)/toxcore $(toxcore_CONFIGURE) -D CMAKE_INSTALL_PREFIX=$(PREFIX) -D ENABLE_STATIC=ON -D ENABLE_SHARED=OFF -D MUST_BUILD_TOXAV=ON -D BOOTSTRAP_DAEMON=OFF
+	$(MAKE) -C $(BUILDDIR)/toxcore install
 	mkdir -p $(@D) && touch $@
 	@$(POST_RULE)
 
 #############################################################################
 # libsodium
 
-$(SRCDIR)/libsodium:
-	$(GIT_CLONE) --branch=1.0.18 https://github.com/jedisct1/libsodium $@
-
-$(PREFIX)/libsodium.stamp: $(SRCDIR)/libsodium $(TOOLCHAIN_FILE)
+libsodium: $(PREFIX)/libsodium.stamp
+$(PREFIX)/libsodium.stamp: $(TOOLCHAIN_FILE)
 	@$(PRE_RULE)
-	cd $< && autoreconf -fi
-	mkdir -p $(BUILDDIR)/$(notdir $<)
-	cd $(BUILDDIR)/$(notdir $<) && $(SRCDIR)/$(notdir $<)/configure $($(notdir $<)_CONFIGURE)
-	$(MAKE) -C $(BUILDDIR)/$(notdir $<) install V=0
+	test -d $(SRCDIR)/libsodium || $(GIT_CLONE) --branch=1.0.19 https://github.com/jedisct1/libsodium $(SRCDIR)/libsodium
+	cd $(SRCDIR)/libsodium && autoreconf -fi
+	mkdir -p $(BUILDDIR)/libsodium
+	cd $(BUILDDIR)/libsodium && $(SRCDIR)/libsodium/configure $(libsodium_CONFIGURE) --prefix=$(PREFIX) --disable-shared
+	$(MAKE) -C $(BUILDDIR)/libsodium install V=0
 	mkdir -p $(@D) && touch $@
 	@$(POST_RULE)
 
 #############################################################################
 # opus
 
-$(SRCDIR)/opus:
-	$(GIT_CLONE) https://github.com/xiph/opus $@
-
-$(PREFIX)/opus.stamp: $(SRCDIR)/opus $(TOOLCHAIN_FILE)
+opus: $(PREFIX)/opus.stamp
+$(PREFIX)/opus.stamp: $(TOOLCHAIN_FILE)
 	@$(PRE_RULE)
-	cd $< && autoreconf -fi
-	mkdir -p $(BUILDDIR)/$(notdir $<)
-	cd $(BUILDDIR)/$(notdir $<) && $(SRCDIR)/$(notdir $<)/configure $($(notdir $<)_CONFIGURE)
-	$(MAKE) -C $(BUILDDIR)/$(notdir $<) install V=0
+	test -d $(SRCDIR)/opus || $(GIT_CLONE) https://github.com/xiph/opus $(SRCDIR)/opus
+	cd $(SRCDIR)/opus && autoreconf -fi
+	mkdir -p $(BUILDDIR)/opus
+	cd $(BUILDDIR)/opus && $(SRCDIR)/opus/configure $(opus_CONFIGURE) --prefix=$(PREFIX) --disable-shared
+	$(MAKE) -C $(BUILDDIR)/opus install V=1
 	mkdir -p $(@D) && touch $@
 	@$(POST_RULE)
 
 #############################################################################
 # libvpx
 
-$(SRCDIR)/libvpx:
-	$(GIT_CLONE) --branch=v1.6.0 https://github.com/webmproject/libvpx $@
-	cd $@ && patch -p1 < $(CURDIR)/scripts/patches/libvpx.patch
-
-$(PREFIX)/libvpx.stamp: $(SRCDIR)/libvpx $(TOOLCHAIN_FILE)
+libvpx: $(PREFIX)/libvpx.stamp
+$(PREFIX)/libvpx.stamp: $(TOOLCHAIN_FILE)
 	@$(PRE_RULE)
+	test -d $(SRCDIR)/libvpx || $(GIT_CLONE) --branch=v1.15.0 https://github.com/webmproject/libvpx $(SRCDIR)/libvpx
 	echo "$(PATH)"
-	mkdir -p $(BUILDDIR)/$(notdir $<)
-	cd $(BUILDDIR)/$(notdir $<) && $(SRCDIR)/$(notdir $<)/configure $($(notdir $<)_CONFIGURE)
-	$(MAKE) -C $(BUILDDIR)/$(notdir $<) install
+	mkdir -p $(BUILDDIR)/libvpx
+	cd $(BUILDDIR)/libvpx && $(SRCDIR)/libvpx/configure $(libvpx_CONFIGURE) --prefix=$(PREFIX) --disable-examples --disable-unit-tests --enable-pic || (cat config.log && false)
+	$(libvpx_PATCH)
+	$(MAKE) -C $(BUILDDIR)/libvpx install
 	mkdir -p $(@D) && touch $@
 	@$(POST_RULE)
diff --git a/scripts/patches/libvpx.patch b/scripts/patches/libvpx.patch
deleted file mode 100644
index 071316b27..000000000
--- a/scripts/patches/libvpx.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 4f0071b..f8e7b69 100644
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -918,92 +918,6 @@ process_common_toolchain() {
- 
-       asm_conversion_cmd="cat"
- 
--      case ${tgt_cc} in
--        gcc)
--          link_with_cc=gcc
--          setup_gnu_toolchain
--          arch_int=${tgt_isa##armv}
--          arch_int=${arch_int%%te}
--          check_add_asflags --defsym ARCHITECTURE=${arch_int}
--          tune_cflags="-mtune="
--          if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then
--            if [ -z "${float_abi}" ]; then
--              check_cpp <<EOF && float_abi=hard || float_abi=softfp
--#ifndef __ARM_PCS_VFP
--#error "not hardfp"
--#endif
--EOF
--            fi
--            check_add_cflags  -march=armv7-a -mfloat-abi=${float_abi}
--            check_add_asflags -march=armv7-a -mfloat-abi=${float_abi}
--
--            if enabled neon || enabled neon_asm; then
--              check_add_cflags -mfpu=neon #-ftree-vectorize
--              check_add_asflags -mfpu=neon
--            fi
--          elif [ ${tgt_isa} = "arm64" ] || [ ${tgt_isa} = "armv8" ]; then
--            check_add_cflags -march=armv8-a
--            check_add_asflags -march=armv8-a
--          else
--            check_add_cflags -march=${tgt_isa}
--            check_add_asflags -march=${tgt_isa}
--          fi
--
--          enabled debug && add_asflags -g
--          asm_conversion_cmd="${source_path}/build/make/ads2gas.pl"
--          if enabled thumb; then
--            asm_conversion_cmd="$asm_conversion_cmd -thumb"
--            check_add_cflags -mthumb
--            check_add_asflags -mthumb -mimplicit-it=always
--          fi
--          ;;
--        vs*)
--          asm_conversion_cmd="${source_path}/build/make/ads2armasm_ms.pl"
--          AS_SFX=.s
--          msvs_arch_dir=arm-msvs
--          disable_feature multithread
--          disable_feature unit_tests
--          vs_version=${tgt_cc##vs}
--          if [ $vs_version -ge 12 ]; then
--            # MSVC 2013 doesn't allow doing plain .exe projects for ARM,
--            # only "AppContainerApplication" which requires an AppxManifest.
--            # Therefore disable the examples, just build the library.
--            disable_feature examples
--          fi
--          ;;
--        rvct)
--          CC=armcc
--          AR=armar
--          AS=armasm
--          LD="${source_path}/build/make/armlink_adapter.sh"
--          STRIP=arm-none-linux-gnueabi-strip
--          NM=arm-none-linux-gnueabi-nm
--          tune_cflags="--cpu="
--          tune_asflags="--cpu="
--          if [ -z "${tune_cpu}" ]; then
--            if [ ${tgt_isa} = "armv7" ]; then
--              if enabled neon || enabled neon_asm
--              then
--                check_add_cflags --fpu=softvfp+vfpv3
--                check_add_asflags --fpu=softvfp+vfpv3
--              fi
--              check_add_cflags --cpu=Cortex-A8
--              check_add_asflags --cpu=Cortex-A8
--            else
--              check_add_cflags --cpu=${tgt_isa##armv}
--              check_add_asflags --cpu=${tgt_isa##armv}
--            fi
--          fi
--          arch_int=${tgt_isa##armv}
--          arch_int=${arch_int%%te}
--          check_add_asflags --pd "\"ARCHITECTURE SETA ${arch_int}\""
--          enabled debug && add_asflags -g
--          add_cflags --gnu
--          add_cflags --enum_is_int
--          add_cflags --wchar32
--          ;;
--      esac
--
-       case ${tgt_os} in
-         none*)
-           disable_feature multithread
-@@ -1015,10 +929,16 @@ EOF
-             die "Must specify --sdk-path for Android builds."
-           fi
- 
-+          if [ ${tgt_isa} = "arm64" ]; then
-+            TRIPLE=aarch64-linux-android
-+          else
-+            TRIPLE=arm-linux-androideabi
-+          fi
-+
-           SDK_PATH=${sdk_path}
-           COMPILER_LOCATION=`find "${SDK_PATH}" \
--                             -name "arm-linux-androideabi-gcc*" -print -quit`
--          TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/arm-linux-androideabi-
-+                             -name "${TRIPLE}-gcc*" -print -quit`
-+          TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/${TRIPLE}-
-           CC=${TOOLCHAIN_PATH}gcc
-           CXX=${TOOLCHAIN_PATH}g++
-           AR=${TOOLCHAIN_PATH}ar
-@@ -1041,9 +961,11 @@ EOF
-             add_ldflags "--sysroot=${alt_libc}"
-           fi
- 
--          # linker flag that routes around a CPU bug in some
--          # Cortex-A8 implementations (NDK Dev Guide)
--          add_ldflags "-Wl,--fix-cortex-a8"
-+          if [ ${tgt_isa} != "arm64" ]; then
-+            # linker flag that routes around a CPU bug in some
-+            # Cortex-A8 implementations (NDK Dev Guide)
-+            add_ldflags "-Wl,--fix-cortex-a8"
-+          fi
- 
-           enable_feature pic
-           soft_enable realtime_only
-@@ -1137,6 +1059,92 @@ EOF
-           fi
-           ;;
-       esac
-+
-+      case ${tgt_cc} in
-+        gcc)
-+          link_with_cc=gcc
-+          setup_gnu_toolchain
-+          arch_int=${tgt_isa##armv}
-+          arch_int=${arch_int%%te}
-+          check_add_asflags --defsym ARCHITECTURE=${arch_int}
-+          tune_cflags="-mtune="
-+          if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then
-+            if [ -z "${float_abi}" ]; then
-+              check_cpp <<EOF && float_abi=hard || float_abi=softfp
-+#ifndef __ARM_PCS_VFP
-+#error "not hardfp"
-+#endif
-+EOF
-+            fi
-+            check_add_cflags  -march=armv7-a -mfloat-abi=${float_abi}
-+            check_add_asflags -march=armv7-a -mfloat-abi=${float_abi}
-+
-+            if enabled neon || enabled neon_asm; then
-+              check_add_cflags -mfpu=neon #-ftree-vectorize
-+              check_add_asflags -mfpu=neon
-+            fi
-+          elif [ ${tgt_isa} = "arm64" ] || [ ${tgt_isa} = "armv8" ]; then
-+            check_add_cflags -march=armv8-a
-+            check_add_asflags -march=armv8-a
-+          else
-+            check_add_cflags -march=${tgt_isa}
-+            check_add_asflags -march=${tgt_isa}
-+          fi
-+
-+          enabled debug && add_asflags -g
-+          asm_conversion_cmd="${source_path}/build/make/ads2gas.pl"
-+          if enabled thumb; then
-+            asm_conversion_cmd="$asm_conversion_cmd -thumb"
-+            check_add_cflags -mthumb
-+            check_add_asflags -mthumb -mimplicit-it=always
-+          fi
-+          ;;
-+        vs*)
-+          asm_conversion_cmd="${source_path}/build/make/ads2armasm_ms.pl"
-+          AS_SFX=.s
-+          msvs_arch_dir=arm-msvs
-+          disable_feature multithread
-+          disable_feature unit_tests
-+          vs_version=${tgt_cc##vs}
-+          if [ $vs_version -ge 12 ]; then
-+            # MSVC 2013 doesn't allow doing plain .exe projects for ARM,
-+            # only "AppContainerApplication" which requires an AppxManifest.
-+            # Therefore disable the examples, just build the library.
-+            disable_feature examples
-+          fi
-+          ;;
-+        rvct)
-+          CC=armcc
-+          AR=armar
-+          AS=armasm
-+          LD="${source_path}/build/make/armlink_adapter.sh"
-+          STRIP=arm-none-linux-gnueabi-strip
-+          NM=arm-none-linux-gnueabi-nm
-+          tune_cflags="--cpu="
-+          tune_asflags="--cpu="
-+          if [ -z "${tune_cpu}" ]; then
-+            if [ ${tgt_isa} = "armv7" ]; then
-+              if enabled neon || enabled neon_asm
-+              then
-+                check_add_cflags --fpu=softvfp+vfpv3
-+                check_add_asflags --fpu=softvfp+vfpv3
-+              fi
-+              check_add_cflags --cpu=Cortex-A8
-+              check_add_asflags --cpu=Cortex-A8
-+            else
-+              check_add_cflags --cpu=${tgt_isa##armv}
-+              check_add_asflags --cpu=${tgt_isa##armv}
-+            fi
-+          fi
-+          arch_int=${tgt_isa##armv}
-+          arch_int=${arch_int%%te}
-+          check_add_asflags --pd "\"ARCHITECTURE SETA ${arch_int}\""
-+          enabled debug && add_asflags -g
-+          add_cflags --gnu
-+          add_cflags --enum_is_int
-+          add_cflags --wchar32
-+          ;;
-+      esac
-       ;;
-     mips*)
-       link_with_cc=gcc
-@@ -1188,6 +1196,17 @@ EOF
-           LD=${LD:-${CROSS}gcc}
-           CROSS=${CROSS-g}
-           ;;
-+        android*)
-+          case ${toolchain} in
-+            x86_64*)
-+              CROSS=${CROSS:-x86_64-linux-android-}
-+              ;;
-+            *)
-+              CROSS=${CROSS:-i686-linux-android-}
-+              ;;
-+          esac
-+          add_asflags -D__ANDROID__
-+          ;;
-         os2)
-           disable_feature pic
-           AS=${AS:-nasm}
-diff --git a/configure b/configure
-index f82ee04..5de9866 100755
---- a/configure
-+++ b/configure
-@@ -97,6 +97,7 @@ EOF
- 
- # all_platforms is a list of all supported target platforms. Maintain
- # alphabetically by architecture, generic-gnu last.
-+all_platforms="${all_platforms} arm64-android-gcc"
- all_platforms="${all_platforms} arm64-darwin-gcc"
- all_platforms="${all_platforms} arm64-linux-gcc"
- all_platforms="${all_platforms} armv6-linux-rvct"
-diff --git a/libs.mk b/libs.mk
-index 9a6092a..53d3e38 100644
---- a/libs.mk
-+++ b/libs.mk
-@@ -330,11 +330,11 @@ vpx.pc: config.mk libs.mk
- 	$(qexec)echo 'Requires:' >> $@
- 	$(qexec)echo 'Conflicts:' >> $@
- 	$(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@
--ifeq ($(HAVE_PTHREAD_H),yes)
--	$(qexec)echo 'Libs.private: -lm -lpthread' >> $@
--else
-+#ifeq ($(HAVE_PTHREAD_H),yes)
-+#	$(qexec)echo 'Libs.private: -lm -lpthread' >> $@
-+#else
- 	$(qexec)echo 'Libs.private: -lm' >> $@
--endif
-+#endif
- 	$(qexec)echo 'Cflags: -I$${includedir}' >> $@
- INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
- INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc