diff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp
index eb5a363a..55b83f69 100644
--- a/src/libcamera/process.cpp
+++ b/src/libcamera/process.cpp
@@ -9,6 +9,7 @@
 
 #include <algorithm>
 #include <dirent.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <string.h>
@@ -119,7 +120,25 @@ Process::Process()
 Process::~Process()
 {
 	kill();
-	/* \todo wait for child process to exit */
+
+	/*
+	 * Reap the child process if it hasn't been already by onPidfdNotify(),
+	 * which is the case when the Process is destroyed before the event loop
+	 * got a chance to notice that the child exited. Otherwise the child is
+	 * left as a zombie until this process exits, which accumulates in a
+	 * long-lived process that creates and destroys many Process instances.
+	 * The child has just been sent SIGKILL, so the wait only blocks until
+	 * the kernel has terminated it.
+	 */
+	if (pidfd_.isValid()) {
+		siginfo_t info;
+		int ret;
+
+		do {
+			ret = waitid(static_cast<idtype_t>(P_PIDFD), pidfd_.get(),
+				     &info, WEXITED);
+		} while (ret < 0 && errno == EINTR);
+	}
 }
 
 /**
diff --git a/test/process/process_test.cpp b/test/process/process_test.cpp
index fe76666e..762e6027 100644
--- a/test/process/process_test.cpp
+++ b/test/process/process_test.cpp
@@ -6,7 +6,9 @@
  */
 
 #include <array>
+#include <errno.h>
 #include <iostream>
+#include <sys/wait.h>
 #include <unistd.h>
 
 #include <libcamera/base/event_dispatcher.h>
@@ -76,6 +78,50 @@ protected:
 			return TestFail;
 		}
 
+		/*
+		 * Test that destroying a Process that is still running reaps
+		 * the child process, without leaving a zombie behind.
+		 */
+		{
+			Process proc;
+
+			ret = proc.start(self(), args);
+			if (ret) {
+				cerr << "failed to start process" << endl;
+				return TestFail;
+			}
+		}
+
+		/*
+		 * The test process has no other child, so waitpid() reports
+		 * ECHILD when none is left to reap.
+		 */
+		if (waitpid(-1, nullptr, WNOHANG) != -1 || errno != ECHILD) {
+			cerr << "child process not reaped on destruction" << endl;
+			return TestFail;
+		}
+
+		/*
+		 * Test the same for a child that has already exited but that
+		 * the event loop hasn't noticed yet.
+		 */
+		{
+			Process proc;
+
+			ret = proc.start(self(), args);
+			if (ret) {
+				cerr << "failed to start process" << endl;
+				return TestFail;
+			}
+
+			usleep(200000);
+		}
+
+		if (waitpid(-1, nullptr, WNOHANG) != -1 || errno != ECHILD) {
+			cerr << "exited child process not reaped on destruction" << endl;
+			return TestFail;
+		}
+
 		return TestPass;
 	}
 
