diff --git a/ChangeLog b/ChangeLog
index 44d654e7a9..4f6a07b843 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug  7 14:57:12 EDT 2006 Daniel Berrange <berrange@redhat.com>
+
+	* src/xend_internal.c: Corrected string length calculation when appending
+	a CDROM boot device element. Fixes corrupt XML structure.
+
 Mon Aug  7 11:06:20 EDT 2006 Daniel Berrange <berrange@redhat.com>
 
 	* src/xend_internal.c: Added a 'port' attribute to the '<graphics>'
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 4eae24145d..64c332139d 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -1406,7 +1406,7 @@ xend_parse_sexp_desc_os(struct sexpr *node, virBufferPtr buf, int hvm)
 	    */
                virBufferAdd(buf, "    <boot dev='hda'/>\n", 22 );
            else if (strcmp(tmp, "d") == 0)
-               virBufferAdd(buf, "    <boot dev='/dev/cdrom'/>\n", 24 );
+               virBufferAdd(buf, "    <boot dev='/dev/cdrom'/>\n", 29 );
         }
     } else {
         virBufferVSprintf(buf, "    <type>linux</type>\n");