diff --git a/repos/libports/ports/qt5.hash b/repos/libports/ports/qt5.hash
index fccc23f724..20e4612b76 100644
--- a/repos/libports/ports/qt5.hash
+++ b/repos/libports/ports/qt5.hash
@@ -1 +1 @@
-3fc407eae3c4c5e8d0194b04f0e18c51618d1188
+0bf1a25e14bf04d6b6d8c4ecca3f611a8a9f364d
diff --git a/repos/libports/ports/qt5.port b/repos/libports/ports/qt5.port
index be5b753c30..28ec32acf6 100644
--- a/repos/libports/ports/qt5.port
+++ b/repos/libports/ports/qt5.port
@@ -4,5 +4,5 @@ VERSION := 5.15.2
 DOWNLOADS := qt5.git
 
 URL(qt5) := https://github.com/cproc/qt5.git
-REV(qt5) := issue5158
+REV(qt5) := issue5205
 DIR(qt5) := src/lib/qt5
diff --git a/repos/libports/recipes/src/qt5_tooltips/content.mk b/repos/libports/recipes/src/qt5_tooltips/content.mk
new file mode 100644
index 0000000000..6080e18ad6
--- /dev/null
+++ b/repos/libports/recipes/src/qt5_tooltips/content.mk
@@ -0,0 +1,21 @@
+MIRROR_FROM_REP_DIR := src/app/qt5/examples/tooltips
+
+content: $(MIRROR_FROM_REP_DIR) LICENSE
+
+$(MIRROR_FROM_REP_DIR):
+	$(mirror_from_rep_dir)
+
+PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
+
+MIRROR_FROM_PORT_DIR := src/lib/qt5/qtbase/examples/widgets/widgets/tooltips \
+                        src/lib/qt5/qtbase/.qmake.conf
+
+content: $(MIRROR_FROM_PORT_DIR)
+
+$(MIRROR_FROM_PORT_DIR):
+	mkdir -p $(dir $@)
+	cp -r $(PORT_DIR)/$@ $(dir $@)
+
+LICENSE:
+	cp $(PORT_DIR)/src/lib/qt5/LICENSE.GPLv3 $@
+
diff --git a/repos/libports/recipes/src/qt5_tooltips/hash b/repos/libports/recipes/src/qt5_tooltips/hash
new file mode 100644
index 0000000000..5f156e45d3
--- /dev/null
+++ b/repos/libports/recipes/src/qt5_tooltips/hash
@@ -0,0 +1 @@
+2024-04-29 f57e4848b214af1423781772bc7c1cb51c88d1cb
diff --git a/repos/libports/recipes/src/qt5_tooltips/used_apis b/repos/libports/recipes/src/qt5_tooltips/used_apis
new file mode 100644
index 0000000000..769561c97d
--- /dev/null
+++ b/repos/libports/recipes/src/qt5_tooltips/used_apis
@@ -0,0 +1,6 @@
+libc
+mesa
+qt5_base
+qt5_component
+so
+stdcxx
diff --git a/repos/libports/run/qt5_tooltips.run b/repos/libports/run/qt5_tooltips.run
new file mode 100644
index 0000000000..a03d432468
--- /dev/null
+++ b/repos/libports/run/qt5_tooltips.run
@@ -0,0 +1,46 @@
+source ${genode_dir}/repos/libports/run/qt5_common.inc
+
+import_from_depot [depot_user]/src/qt5_tooltips \
+                  [depot_user]/src/qt5_component
+
+install_config {
+<config>
+	<parent-provides>
+		} [qt5_parent_provides] {
+	</parent-provides>
+	<default caps="100"/>
+	<default-route>
+		<any-service> <parent/> <any-child/> </any-service>
+	</default-route>
+	} [qt5_start_nodes] {
+	<start name="tooltips" caps="200">
+		<resource name="RAM" quantum="80M"/>
+		<config>
+			<vfs>
+				<dir name="dev">
+					<log/>
+					<inline name="rtc">2018-01-01 00:01</inline>
+				</dir>
+				<dir name="pipe"> <pipe/> </dir>
+				<tar name="qt5_dejavusans.tar"/>
+				<tar name="qt5_libqgenode.tar"/>
+			</vfs>
+			<libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/>
+		</config>
+		<route>
+			<service name="Gui"> <child name="wm"/> </service>
+			<service name="Report" label="shape">
+				<child name="pointer" label="wm -> tooltips -> shape"/>
+			</service>
+			<service name="ROM" label="mesa_gpu_drv.lib.so">
+				<parent label="mesa_gpu-softpipe.lib.so" />
+			</service>
+			<any-service> <parent /> <any-child/> </any-service>
+		</route>
+	</start>
+</config>
+}
+
+build_boot_image [qt5_boot_modules]
+
+run_genode_until forever
diff --git a/repos/libports/src/app/qt5/examples/tooltips/target.mk b/repos/libports/src/app/qt5/examples/tooltips/target.mk
new file mode 100644
index 0000000000..3756f30bac
--- /dev/null
+++ b/repos/libports/src/app/qt5/examples/tooltips/target.mk
@@ -0,0 +1,9 @@
+QMAKE_PROJECT_FILE = $(QT_DIR)/qtbase/examples/widgets/widgets/tooltips/tooltips.pro
+
+QMAKE_TARGET_BINARIES = tooltips
+
+QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5PrintSupport libQt5Widgets
+
+LIBS = libc libm mesa qt5_component stdcxx $(QT5_PORT_LIBS)
+
+include $(call select_from_repositories,lib/import/import-qt5_qmake.mk)