diff --git a/ChangeLog b/ChangeLog
index 9f9b988f40..d825e56213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar  8 22:07:14 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+	* qemud/conf.c: Fix double free in XML parsing routine
+
 Thu Mar  8 18:31:14 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
 	* qemud/Makefile.am: Make sure to create $PREFIX/var/run/libvirt
diff --git a/qemud/conf.c b/qemud/conf.c
index 2e87c531b4..c8bdebdca9 100644
--- a/qemud/conf.c
+++ b/qemud/conf.c
@@ -828,6 +828,7 @@ static struct qemud_vm_def *qemudParseXML(struct qemud_server *server,
                 goto error;
             }
             xmlFree(prop);
+            prop = NULL;
         }
     }
     xmlXPathFreeObject(obj);
@@ -877,6 +878,7 @@ static struct qemud_vm_def *qemudParseXML(struct qemud_server *server,
             goto error;
         }
         xmlFree(prop);
+        prop = NULL;
     }
     xmlXPathFreeObject(obj);