diff --git a/community/assimp/APKBUILD b/community/assimp/APKBUILD
index 05aa81eb5b16d9838a765c66dd85adf40135aa78..5fa928fcc36024110e0dc3a71266041ab824767a 100644
--- a/community/assimp/APKBUILD
+++ b/community/assimp/APKBUILD
@@ -1,28 +1,32 @@
 # Contributor: Russ Webber <russ@rw.id.au>
 # Maintainer: Russ Webber <russ@rw.id.au>
 pkgname=assimp
-pkgver=5.2.3
+pkgver=5.2.5
 pkgrel=0
 pkgdesc="Open Asset Import Library imports and exports 3D model formats."
 url="http://www.assimp.org/"
-arch="all !s390x" # fails to build on big-endian
+arch="all"
 license="BSD-3-Clause"
 makedepends="
 	cmake
 	samurai
 	zlib-dev
 	"
-subpackages="$pkgname-dev"
-source="https://github.com/assimp/assimp/archive/v$pkgver/assimp-v$pkgver.tar.gz"
+subpackages="$pkgname-dev $pkgname-libs"
+source="https://github.com/assimp/assimp/archive/v$pkgver/assimp-v$pkgver.tar.gz
+	version.patch
+	"
+
+case "$CARCH" in
+s390x)
+	# a few tests fail
+	options="$options !check"
+	;;
+esac
 
 prepare() {
 	default_prepare
 
-	# fails for some unknown divine reason
-	sed -i \
-		-e "/AssimpAPITest_aiQuaternion/d" \
-		test/CMakeLists.txt
-
 	# tests report correct values, but comparison fails
 	case $CARCH in
 	x86)
@@ -41,7 +45,10 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=True \
-		-DASSIMP_BUILD_TESTS=True \
+		-DASSIMP_IGNORE_GIT_HASH=ON \
+		-DASSIMP_BUILD_ASSIMP_TOOLS=ON \
+		-DASSIMP_BUILD_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DASSIMP_WARNINGS_AS_ERRORS=OFF \
 		-DASSIMP_BUILD_MINIZIP=True  # use vendored fork of minizip
 	cmake --build build
 }
@@ -56,5 +63,6 @@ package() {
 }
 
 sha512sums="
-accc1020877b631431bd0bc2de20b530d7e8d234e960904070292a4a08e768c55d1d0cf614c68d38f099fab2d086420c3ffd3f729cb538b169c1275ef0be1eaa  assimp-v5.2.3.tar.gz
+ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb  assimp-v5.2.5.tar.gz
+758e0f83ba5de7b3894c16e79fe1c596f0ba3abb730631e35b0201b560bd15b2e5f4d001a2d11b757dd1b44f241d2cf57ad7d1a45e4be434fcaabdeda4e7d89e  version.patch
 "
diff --git a/community/assimp/version.patch b/community/assimp/version.patch
new file mode 100644
index 0000000000000000000000000000000000000000..391ed75ccaa515f9db370e44160c8878fe4d6f82
--- /dev/null
+++ b/community/assimp/version.patch
@@ -0,0 +1,36 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 458a328..62bbd0a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED)
+   add_definitions(-DASSIMP_USE_HUNTER)
+ ENDIF()
+ 
+-PROJECT(Assimp VERSION 5.2.4)
++PROJECT(Assimp VERSION 5.2.5)
+ 
+ # All supported options ###############################################
+ 
+diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
+index 5826b28..30301f7 100644
+--- a/test/unit/utVersion.cpp
++++ b/test/unit/utVersion.cpp
+@@ -61,17 +61,13 @@ TEST_F( utVersion, aiGetVersionMajorTest ) {
+ }
+ 
+ TEST_F( utVersion, aiGetVersionPatchTest ) {
+-    EXPECT_EQ(aiGetVersionPatch(), 4U );
++    EXPECT_EQ(aiGetVersionPatch(), 5U );
+ }
+ 
+ TEST_F( utVersion, aiGetCompileFlagsTest ) {
+     EXPECT_NE( aiGetCompileFlags(), 0U );
+ }
+ 
+-TEST_F( utVersion, aiGetVersionRevisionTest ) {
+-    EXPECT_NE( aiGetVersionRevision(), 0U );
+-}
+-
+ TEST_F( utVersion, aiGetBranchNameTest ) {
+     EXPECT_NE( nullptr, aiGetBranchName() );
+ }