diff --git a/ChangeLog b/ChangeLog
index d79bb4b91b..529d2a0b85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 20 10:42:27 EST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* qemud/qemud.c: Set close-on-exec flag for signal pipe
+
 Wed Feb 20 10:39:27 EST 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* configure.in: Added checks for LVM tools
diff --git a/qemud/qemud.c b/qemud/qemud.c
index 3a5e44c07d..a40dfcbbb0 100644
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -2089,7 +2089,9 @@ int main(int argc, char **argv) {
 
     if (pipe(sigpipe) < 0 ||
         qemudSetNonBlock(sigpipe[0]) < 0 ||
-        qemudSetNonBlock(sigpipe[1]) < 0) {
+        qemudSetNonBlock(sigpipe[1]) < 0 ||
+        qemudSetCloseExec(sigpipe[0]) < 0 ||
+        qemudSetCloseExec(sigpipe[1]) < 0) {
         qemudLog(QEMUD_ERR, _("Failed to create pipe: %s"),
                  strerror(errno));
         goto error1;