diff --git a/games-kids/gcompris/gcompris-4.3.recipe b/games-kids/gcompris/gcompris-25.0.recipe
similarity index 53%
rename from games-kids/gcompris/gcompris-4.3.recipe
rename to games-kids/gcompris/gcompris-25.0.recipe
index c20cf981d..456f6782b 100644
--- a/games-kids/gcompris/gcompris-4.3.recipe
+++ b/games-kids/gcompris/gcompris-25.0.recipe
@@ -17,8 +17,9 @@ COPYRIGHT="2014-2016 Bruno Coudoin
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-$portVersion.tar.xz"
-CHECKSUM_SHA256="c7ea1387436eecc9c29ca191daf9002c37251b9f79efabbff873dd7edb03b5c7"
+CHECKSUM_SHA256="13797ee65e2bb1aba2765e8893981259ff921a955a0158b95f9d5eb65d43d39c"
 SOURCE_DIR="gcompris-qt-$portVersion"
+PATCHES="gcompris-$portVersion.patchset"
 ADDITIONAL_FILES="gcompris.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -32,53 +33,61 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Multimedia$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libQt5OpenGL$secondaryArchSuffix
-	lib:libQt5Qml$secondaryArchSuffix
-	lib:libQt5Quick$secondaryArchSuffix
-	lib:libQt5Svg$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix
-	lib:libQt5XmlPatterns$secondaryArchSuffix
+	lib:libopenal$secondaryArchSuffix
+	lib:libQt6Charts$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Multimedia$secondaryArchSuffix
+	lib:libQt6Network$secondaryArchSuffix
+	lib:libQt6OpenGL$secondaryArchSuffix
+	lib:libQt6Qml$secondaryArchSuffix
+	lib:libQt6Quick$secondaryArchSuffix
+	lib:libQt6Sensors$secondaryArchSuffix
+	lib:libQt6Svg$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules$secondaryArchSuffix
+	qml_box2d_qt6$secondaryArchSuffix
+	qt6_tools${secondaryArchSuffix}_devel
 	devel:libcrypto$secondaryArchSuffix >= 3
-	devel:libGL$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Multimedia$secondaryArchSuffix
-	devel:libQt5Network$secondaryArchSuffix
-	devel:libQt5OpenGL$secondaryArchSuffix
-	devel:libQt5Qml$secondaryArchSuffix
-	devel:libQt5Quick$secondaryArchSuffix
-	devel:libQt5Svg$secondaryArchSuffix
-	devel:libQt5Widgets$secondaryArchSuffix
-	devel:libQt5Xml$secondaryArchSuffix
-	devel:libQt5XmlPatterns$secondaryArchSuffix
+	devel:libQt6Charts$secondaryArchSuffix
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Gui$secondaryArchSuffix
+	devel:libQt6Multimedia$secondaryArchSuffix
+	devel:libQt6Network$secondaryArchSuffix
+	devel:libQt6Qml$secondaryArchSuffix
+	devel:libQt6Quick$secondaryArchSuffix
+	devel:libQt6Svg$secondaryArchSuffix
+	devel:libQt6Sensors$secondaryArchSuffix
+	devel:libQt6Widgets$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix >= 3
-	qt5:QmlBox2d
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix
 	cmd:make
 	cmd:msgattrib$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+TEST_REQUIRES="
+	qthaikuplugins$secondaryArchSuffix
+	"
+
 BUILD()
 {
-	cmake -S . -B build -DCMAKE_BUILD_TYPE=Release \
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DQML_BOX2D_LIBRARY=$dataDir/Qt5/qml/Box2D.2.0 \
-		-DGRAPHICAL_RENDERER=software
+		-DCMAKE_INSTALL_BINDIR=$appsDir \
+		-DGRAPHICAL_RENDERER=software \
+		-DQML_BOX2D_LIBRARY="`finddir B_SYSTEM_DATA_DIRECTORY`/Qt6/qml/Box2D" \
+		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DBUILD_TESTING=ON
+
 	make -C build $jobArgs
 }
 
@@ -86,9 +95,9 @@ INSTALL()
 {
 	make -C build install
 
-	mkdir -p $appsDir
-	mv $prefix/bin/gcompris-qt $appsDir/GCompris
-	rm -r $prefix/bin
+#	mkdir -p $appsDir
+#	mv $prefix/bin/gcompris-qt $appsDir/GCompris
+#	rm -r $prefix/bin
 
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
@@ -99,3 +108,8 @@ INSTALL()
 	addResourcesToBinaries gcompris.rdef $appsDir/GCompris
 	addAppDeskbarSymlink $appsDir/GCompris
 }
+
+TEST()
+{
+	ctest --test-dir build --output-on-failure
+}
diff --git a/games-kids/gcompris/patches/gcompris-25.0.patchset b/games-kids/gcompris/patches/gcompris-25.0.patchset
new file mode 100644
index 000000000..ca45a2928
--- /dev/null
+++ b/games-kids/gcompris/patches/gcompris-25.0.patchset
@@ -0,0 +1,22 @@
+From 54f85e503eea477d3ad59253ccdda967ce8a30ff Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Mon, 3 Feb 2025 11:05:00 +0100
+Subject: Rename GCompris binary on Haiku too
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f4693f4..24082ec 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,6 +66,8 @@ endif()
+ # Set executable filename
+ if(ANDROID)
+   set(GCOMPRIS_EXECUTABLE_NAME GCompris)
++elseif(HAIKU)
++  set(GCOMPRIS_EXECUTABLE_NAME GCompris)
+ elseif(WIN32)
+   set(GCOMPRIS_EXECUTABLE_NAME GCompris)
+ else()
+-- 
+2.45.2
+