diff --git a/ChangeLog b/ChangeLog
index d7f94ac09c..44d654e7a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug  7 11:06:20 EDT 2006 Daniel Berrange <berrange@redhat.com>
+
+	* src/xend_internal.c: Added a 'port' attribute to the '<graphics>'
+	tag when display type is VNC, providing the port number on which
+	the VNC server is listening.
+	
 Mon Aug  7 18:47:48 CEST 2006 Daniel Veillard <veillard@redhat.com>
 
 	* include/libvirt/libvirt.h.in: previous change to libvirt.h should
diff --git a/src/xend_internal.c b/src/xend_internal.c
index ab5ed6d5b7..4eae24145d 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -1598,13 +1598,12 @@ xend_parse_sexp_desc(struct sexpr *root)
 
     if (hvm) {
         /* Graphics device */
-        /* TODO:
-         * Support for some additional attributes for graphics device?
-         */
         tmp = sexpr_node(root, "domain/image/hvm/vnc");
+	/* XXX extract VNC port from XenStore if its available */
         if (tmp != NULL) {
             if (tmp[0] == '1')
-                virBufferAdd(&buf, "    <graphics type='vnc'/>\n", 27 );
+                virBufferVSprintf(&buf, "    <graphics type='vnc' port='%d'/>\n", 
+                                  5900 + sexpr_int(root, "domain/domid"));
         }
         
         tmp = sexpr_node(root, "domain/image/hvm/sdl");