diff --git a/app-emulation/qemu-guest-agent/files/qemu-ga.init-r1 b/app-emulation/qemu-guest-agent/files/qemu-ga.init-r1
deleted file mode 100644
index f08c082709b33..0000000000000
--- a/app-emulation/qemu-guest-agent/files/qemu-ga.init-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
-    GA_METHOD=${GA_METHOD:-virtio-serial}
-    GA_PATH=${GA_PATH:-/dev/virtio-ports/org.qemu.guest_agent.0}
-
-    ebegin "Starting QEMU Guest Agent"
-
-    start-stop-daemon --start --pidfile /run/qemu-ga.pid \
-        --exec /usr/bin/qemu-ga -- -m ${GA_METHOD} -p ${GA_PATH} \
-        -l /var/log/qemu-ga.log -d -f /run/qemu-ga.pid -t /run ${GA_OPTIONS}
-
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping QEMU Guest Agent"
-
-    start-stop-daemon --stop --pidfile /run/qemu-ga.pid
-
-    eend $?
-}
diff --git a/app-emulation/qemu-guest-agent/files/qemu-ga.init-r2 b/app-emulation/qemu-guest-agent/files/qemu-ga.init-r2
new file mode 100644
index 0000000000000..29cf9859083e3
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-ga.init-r2
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2024 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+GA_METHOD=${GA_METHOD:-virtio-serial}
+GA_PATH=${GA_PATH:-/dev/virtio-ports/org.qemu.guest_agent.0}
+
+description="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+command="/usr/bin/qemu-ga"
+pidfile="/run/qemu-ga.pid"
+command_args="-m ${GA_METHOD} -p ${GA_PATH} -l /var/log/qemu-ga.log -d -f ${pidfile} -t /run ${GA_OPTIONS}"
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
index a4e4b3ee8fe2f..8e6f6c77c0242 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
@@ -84,7 +84,7 @@ src_install() {
 	dobin build/qga/qemu-ga
 
 	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+	newinitd "${FILESDIR}/qemu-ga.init-r2" qemu-guest-agent
 	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
 
 	insinto /etc/logrotate.d
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-9.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-9.2.0.ebuild
index a4e4b3ee8fe2f..8e6f6c77c0242 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-9.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-9.2.0.ebuild
@@ -84,7 +84,7 @@ src_install() {
 	dobin build/qga/qemu-ga
 
 	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+	newinitd "${FILESDIR}/qemu-ga.init-r2" qemu-guest-agent
 	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
 
 	insinto /etc/logrotate.d