diff --git a/debian/changelog b/debian/changelog
index ed0b9299..5ff807bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ debian-cd (3.1.8) UNRELEASED; urgency=low
   [ Joey Hess ]
   * Read tasksel's debian-tasks.desc from its new location.
 
+  [ Ian Campbell ]
+  Rename "xm-debian.cfg" to just "debian.cfg" for Xen config.
+
  -- Steve McIntyre <93sam@debian.org>  Tue, 07 Jun 2011 23:03:42 +0100
 
 debian-cd (3.1.7) unstable; urgency=low
diff --git a/tools/boot/wheezy/boot-x86 b/tools/boot/wheezy/boot-x86
index 426c9967..1b23b1b4 100644
--- a/tools/boot/wheezy/boot-x86
+++ b/tools/boot/wheezy/boot-x86
@@ -257,7 +257,7 @@ rm -f boot$N/isolinux/isolinux.cfg.with*
 if variant_enabled "xen" ; then
 	extra_image xen/vmlinuz         "../vmlinuz   ../gtk/vmlinuz"
 	extra_image xen/initrd.gz       "../initrd.gz ../gtk/initrd.gz"
-	extra_image xen/xm-debian.cfg
+	extra_image xen/debian.cfg
 fi
 
 # Modify win32-loader.ini for the "current" arch