diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/debugger/gdb/README xen-unstable.hg-3.0.5-pre-14797.new/tools/debugger/gdb/README
--- xen-unstable.hg-3.0.5-pre-14797.orig/tools/debugger/gdb/README	2007-04-11 19:10:30.000000000 -0400
+++ xen-unstable.hg-3.0.5-pre-14797.new/tools/debugger/gdb/README	2007-04-13 10:37:35.000000000 -0400
@@ -33,6 +33,6 @@ To debug a crashed domU guest:
  1. Add '(enable-dump yes)' to /etc/xen/xend-config.sxp before
     starting xend.
  2. When the domain crashes, a core file is written to
-    '/var/xen/dump/<domain-name>.<domain-id>.core'.
+    '/var/lib/xen/dump/<domain-name>.<domain-id>.core'.
  3. Run 'gdbserver-xen 127.0.0.1:9999 --file <core-file>'.
  4. Connect to the server as for a running guest.
diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/Makefile xen-unstable.hg-3.0.5-pre-14797.new/tools/Makefile
--- xen-unstable.hg-3.0.5-pre-14797.orig/tools/Makefile	2007-04-11 19:10:30.000000000 -0400
+++ xen-unstable.hg-3.0.5-pre-14797.new/tools/Makefile	2007-04-13 10:37:59.000000000 -0400
@@ -41,7 +41,7 @@ install: check
 		$(MAKE) -C $$subdir $@; \
 	done
 	$(MAKE) ioemuinstall
-	$(INSTALL_DIR) $(DESTDIR)/var/xen/dump
+	$(INSTALL_DIR) $(DESTDIR)/var/lib/xen/dump
 	$(INSTALL_DIR) $(DESTDIR)/var/log/xen
 
 .PHONY: clean
diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/python/xen/xend/XendDomainInfo.py xen-unstable.hg-3.0.5-pre-14797.new/tools/python/xen/xend/XendDomainInfo.py
--- xen-unstable.hg-3.0.5-pre-14797.orig/tools/python/xen/xend/XendDomainInfo.py	2007-04-11 19:10:36.000000000 -0400
+++ xen-unstable.hg-3.0.5-pre-14797.new/tools/python/xen/xend/XendDomainInfo.py	2007-04-13 10:37:35.000000000 -0400
@@ -1269,7 +1269,7 @@ class XendDomainInfo:
         try:
             if not corefile:
                 this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime())
-                corefile = "/var/xen/dump/%s-%s.%s.core" % (this_time,
+                corefile = "/var/lib/xen/dump/%s-%s.%s.core" % (this_time,
                                   self.info['name_label'], self.domid)
                 
             if os.path.isdir(corefile):