diff --git a/games-arcade/caveexpress/caveexpress-2.5.1.recipe b/games-arcade/caveexpress/caveexpress-2.5.2.recipe
similarity index 85%
rename from games-arcade/caveexpress/caveexpress-2.5.1.recipe
rename to games-arcade/caveexpress/caveexpress-2.5.2.recipe
index 1d1275057..6198bd14e 100644
--- a/games-arcade/caveexpress/caveexpress-2.5.1.recipe
+++ b/games-arcade/caveexpress/caveexpress-2.5.2.recipe
@@ -4,11 +4,11 @@ from your cave-dwelling clients and drop them off at the collection point. \
 But beware! Mighty mastodons, terrifying pterodactyls and others \
 would rather see you extinct."
 HOMEPAGE="http://www.caveproductions.org/"
-COPYRIGHT="2014-2020 Martin Gerhardy"
+COPYRIGHT="2014-2021 Martin Gerhardy"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://github.com/mgerhardy/caveexpress/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="54b8fb68efc837a78a73b2d285412bc75a28d692918aea4312305fff964f9a26"
+CHECKSUM_SHA256="da8bd71bbb39f898acbfa540c84431629e75f0f8c43878e1f41db1e35f4d30e2"
 PATCHES="caveexpress-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -21,7 +21,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libatomic$secondaryArchSuffix
-	lib:libBox2D$secondaryArchSuffix
+	lib:libbox2d$secondaryArchSuffix
 #	lib:libgtest$secondaryArchSuffix
 	lib:liblua$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
@@ -36,7 +36,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libBox2D$secondaryArchSuffix
+	devel:libbox2d$secondaryArchSuffix
 	devel:glm
 #	devel:libgtest$secondaryArchSuffix
 	devel:liblua$secondaryArchSuffix >= 5.2
@@ -50,27 +50,25 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:ccache
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
-	cmd:make
+	cmd:ninja
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
 {
-	mkdir -p build && cd build
 	export CFLAGS="`pkg-config --cflags lua`"
-	cmake .. -DCMAKE_BUILD_TYPE=Release \
+	cmake -B build -GNinja . \
+		-DCMAKE_BUILD_TYPE=Release \
 		-DCAVEPACKER=OFF \
 		-DCMAKE_INSTALL_PREFIX=$appsDir
-	make $jobArgs
+	ninja -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	ninja -C build install
 	mv $appsDir/caveexpress/caveexpress $appsDir/caveexpress/CaveExpress
 	addAppDeskbarSymlink $appsDir/caveexpress/CaveExpress
 }
diff --git a/games-arcade/caveexpress/patches/caveexpress-2.5.1.patchset b/games-arcade/caveexpress/patches/caveexpress-2.5.2.patchset
similarity index 66%
rename from games-arcade/caveexpress/patches/caveexpress-2.5.1.patchset
rename to games-arcade/caveexpress/patches/caveexpress-2.5.2.patchset
index 519c40973..666a85fca 100644
--- a/games-arcade/caveexpress/patches/caveexpress-2.5.1.patchset
+++ b/games-arcade/caveexpress/patches/caveexpress-2.5.2.patchset
@@ -1,14 +1,14 @@
-From 5031f52ea1e90744e69cabfeeef8d6d8b198cf2c Mon Sep 17 00:00:00 2001
+From 1564b274d6c55a11aa5a2261f08d4a7a1b1457bc Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Tue, 21 Jul 2020 09:14:39 +0000
 Subject: Fix paths for lua5.2
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f214082..68f6f29 100644
+index 52f7cbd..3e4d9a4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -55,7 +55,7 @@ foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
+@@ -54,7 +54,7 @@ foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
  	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib)
  	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib)
  endforeach()
@@ -18,17 +18,17 @@ index f214082..68f6f29 100644
  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CP_CMAKE_DIR})
  set(CMAKE_VERBOSE_MAKEFILE ${VERBOSE})
 -- 
-2.27.0
+2.30.0
 
 
-From cef62bc3e9571d33979c929aa64058692be6be68 Mon Sep 17 00:00:00 2001
+From d0f34197bba4da3675fd8c032f54c7d6cf82e2b7 Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Tue, 21 Jul 2020 09:17:19 +0000
 Subject: Don't use fullscreen on launch, set to 800*600
 
 
 diff --git a/base/caveexpress/config.lua b/base/caveexpress/config.lua
-index 834e79b..583b2f9 100644
+index fbc0af8..9899c34 100644
 --- a/base/caveexpress/config.lua
 +++ b/base/caveexpress/config.lua
 @@ -2,9 +2,9 @@ function isMobile()
@@ -45,10 +45,10 @@ index 834e79b..583b2f9 100644
  defaultfrontend = "sdl"
  defaultsoundengine = "sdl"
 -- 
-2.27.0
+2.30.0
 
 
-From 07c5499fabb47265468426790cc68c2bf47c2d39 Mon Sep 17 00:00:00 2001
+From 49ddd0cd7655694cab422cea55e95fd5d0c5cf17 Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Tue, 21 Jul 2020 09:18:30 +0000
 Subject: Fix launch from Tracker and Deskbar
@@ -80,5 +80,28 @@ index 41cb968..4707873 100644
  	const GamePtr& game = Singleton<GameRegistry>::getInstance().getGame();
  	app.setOrganisation("caveproductions");
 -- 
-2.27.0
+2.30.0
+
+
+From e0ccd0039aaca0450f305e99ae9cbce036d8bc82 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 7 Jun 2021 16:38:29 +0200
+Subject: build without PIE on Haiku
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3e4d9a4..e76d2d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,7 +62,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED on)
+ set(CMAKE_CXX_EXTENSIONS off)
+-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++set(CMAKE_POSITION_INDEPENDENT_CODE !HAIKU)
+ 
+ if (${CMAKE_EXTRA_GENERATOR} MATCHES "Eclipse CDT4")
+ 	message(STATUS "Generate eclipse projects")
+-- 
+2.30.0