diff --git a/ChangeLog b/ChangeLog
index b032655a5e91756eb3c28f34cdc51c85462a273b..d71f38b540c1c3b0f1a1b021fe8b3cd662f0b4e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Sep 28 16:41:41 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/qemu_conf.c: Fix crash processing multiple <input> tags
+
 Fri Sep 28 16:17:41 CEST 2007 Daniel Veillard <veillard@redhat.com>
 
 	* include/libvirt/libvirt.h[.in] src/driver.h src/openvz_driver.c
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index b7ccc4380385df0d1e7a8a226ac557d5f0b42f58..eda181cde9a59b41653145e3bb5c6997d882eea0 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -1312,7 +1312,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn,
             }
             def->ninputs++;
             input->next = NULL;
-            if (i == 0) {
+            if (def->inputs == NULL) {
                 def->inputs = input;
             } else {
                 prev->next = input;