diff --git a/ChangeLog b/ChangeLog
index a425b2d488..d8272b7e88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 14 16:17:20 GMT 2009  John Levon  <levon@movementarian.org>
+
+	* src/xend_internal.c: Add a ':cdrom' marker for PV as well as
+	HVM devices.
+
 Wed Jan 14 15:13:17 GMT 2009  John Levon  <levon@movementarian.org>
 
 	* acinclude.m4:
diff --git a/src/xend_internal.c b/src/xend_internal.c
index c3ffd6396b..5823cb3395 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -5024,6 +5024,8 @@ xenDaemonFormatSxprDisk(virConnectPtr conn ATTRIBUTE_UNUSED,
             virBufferVSprintf(buf, "(dev '%s:%s')", def->dst,
                               def->device == VIR_DOMAIN_DISK_DEVICE_CDROM ?
                               "cdrom" : "disk");
+    } else if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
+        virBufferVSprintf(buf, "(dev '%s:cdrom')", def->dst);
     } else {
         virBufferVSprintf(buf, "(dev '%s')", def->dst);
     }