diff --git a/ChangeLog b/ChangeLog
index a73c34b67cec449b0199928ca01adbe0378eb1c8..4a08b00b0df32e9f89015ec5128665c1da945ce4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Mon Mar  3 14:14:03 CET 2008 Jim Meyering <meyering@redhat.com>
 
+	Plug skipped-qemudCleanup leak.
+	* qemud/qemud.c (main): Call qemudCleanup also upon failure.
+	Otherwise, an error return would skip it and induce leaks.
+
 	Plug remoteReadConfigFile leak.
 	* qemud/qemud.c (remoteReadConfigFile): Be careful to free
 	"conf" after a successful virConfReadFile.
diff --git a/qemud/qemud.c b/qemud/qemud.c
index 851e83ed70dad20b646cefd6ba025d1d7d0c9e64..7ccc9ee00b82ad1cdcdf6540265626e20457c979 100644
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -2166,8 +2166,6 @@ int main(int argc, char **argv) {
 
     qemudRunLoop(server);
 
-    qemudCleanup(server);
-
     close(sigwrite);
 
     if (godaemon)
@@ -2181,6 +2179,7 @@ int main(int argc, char **argv) {
         unlink (pid_file);
 
  error1:
+    qemudCleanup(server);
     return ret;
 }