diff --git a/ChangeLog b/ChangeLog
index eede5f37d47eedb5484e7d91831079afd7c876ce..dd79b76ff522f102d84311713717f604f25db0b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 11 10:46:59 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/qemu_driver.c: Fix parsing of QEMU stdout looking for
+	serial device PTY with Xenner
+
 Fri Jul 11 10:53:59 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/openvz_conf.c: cleanup OpenVZ config file accesses, patch
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 61576c7873a59f5205745eb1e1c8349e26822b53..8d8fcd64b342a6d4bfca9c2a11544be55aa1cbd8 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -528,6 +528,9 @@ static int qemudExtractMonitorPath(const char *haystack,
     strncpy(path, tmp+sizeof(needle), pathmax-1);
     path[pathmax-1] = '\0';
 
+    /* Update offset to point to where we found the needle..*/
+    *offset = tmp - haystack;
+
     /*
      * And look for first whitespace character and nul terminate
      * to mark end of the pty path
@@ -536,6 +539,7 @@ static int qemudExtractMonitorPath(const char *haystack,
     while (*tmp) {
         if (c_isspace(*tmp)) {
             *tmp = '\0';
+            /* ... now further update offset till we get EOL */
             *offset += (sizeof(needle)-1) + strlen(path);
             return 0;
         }