diff --git a/ChangeLog b/ChangeLog
index 4f26fbcac3..129a2ccc7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  1 23:29:33 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+	* src/node_device.c: fix an endless loop in node device XML dump,
+	  patch by Cole Robinson
+
 Wed Jul  1 23:23:19 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
 	* docs/drvone.html docs/drvone.html.in: small OpenNebula driver
diff --git a/src/node_device.c b/src/node_device.c
index cd9f0ef584..e0aaefcbb4 100644
--- a/src/node_device.c
+++ b/src/node_device.c
@@ -73,8 +73,8 @@ static int update_caps(virNodeDeviceObjPtr dev)
                               cap->data.scsi_host.host);
                 }
             }
-            cap = cap->next;
         }
+        cap = cap->next;
     }
 
     return 0;