diff -u xen-3.1-3.1.0/debian/xen-utils-3.1.xendomains.init xen-3.1-3.1.0/debian/xen-utils-3.1.xendomains.init
--- xen-3.1-3.1.0/debian/xen-utils-3.1.xendomains.init
+++ xen-3.1-3.1.0/debian/xen-utils-3.1.xendomains.init
@@ -34,8 +34,8 @@
 	exit 0
 fi
 
-LOCKFILE=/var/lock/subsys/xendomains
-XENDOM_CONFIG=/etc/sysconfig/xendomains
+LOCKFILE=/var/lock/xendomains
+XENDOM_CONFIG=/etc/default/xendomains
 
 test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing";
 	if [ "$1" = "stop" ]; then exit 0;
reverted:
--- xen-3.1-3.1.0/debian/files
+++ xen-3.1-3.1.0.orig/debian/files
@@ -1,14 +0,0 @@
-python-xen-3.1_3.1.0-0ubuntu8_i386.deb misc extra
-xen-hypervisor-3.1_3.1.0-0ubuntu8_i386.deb misc extra
-xen-utils-3.1_3.1.0-0ubuntu8_i386.deb misc extra
-xen-ioemu-3.1_3.1.0-0ubuntu8_i386.deb misc extra
-libxen3.1-dev_3.1.0-0ubuntu8_i386.deb misc extra
-libxen3.1_3.1.0-0ubuntu8_i386.deb misc extra
-python-xen3.1_3.1.0-0ubuntu8_i386.deb misc extra
-xen-docs-3.1_3.1.0-0ubuntu8_all.deb misc extra
-xen-hypervisor-3.1_3.1.0-0ubuntu8_amd64.deb misc extra
-xen-utils-3.1_3.1.0-0ubuntu8_amd64.deb misc extra
-xen-ioemu-3.1_3.1.0-0ubuntu8_amd64.deb misc extra
-libxen3.1-dev_3.1.0-0ubuntu8_amd64.deb misc extra
-libxen3.1_3.1.0-0ubuntu8_amd64.deb misc extra
-python-xen3.1_3.1.0-0ubuntu8_amd64.deb misc extra
diff -u xen-3.1-3.1.0/debian/patches/prefix-ioemu.diff xen-3.1-3.1.0/debian/patches/prefix-ioemu.diff
--- xen-3.1-3.1.0/debian/patches/prefix-ioemu.diff
+++ xen-3.1-3.1.0/debian/patches/prefix-ioemu.diff
@@ -38,0 +39,12 @@
+diff -Naur xen-3.0-3.0.5.orig/tools/xenfb/vncfb.c xen-3.0-3.0.5/tools/xenfb/vncfb.c
+--- xen-3.0-3.0.5.orig/tools/xenfb/vncfb.c	2007-07-23 10:47:35.917573092 +0200
++++ xen-3.0-3.0.5/tools/xenfb/vncfb.c	2007-07-23 10:48:09.907510067 +0200
+@@ -13,7 +13,7 @@
+ 
+ /* Grab key translation support routines from qemu directory. */
+ #define qemu_mallocz(size) calloc(1, (size))
+-static const char *bios_dir = "/usr/share/xen/qemu";
++static const char *bios_dir = "/usr/share/xen-ioemu-3.1/qemu";
+ #include "vnc_keysym.h"
+ #include "keymaps.c"
+ 
diff -u xen-3.1-3.1.0/debian/rules xen-3.1-3.1.0/debian/rules
--- xen-3.1-3.1.0/debian/rules
+++ xen-3.1-3.1.0/debian/rules
@@ -111,6 +111,8 @@
 		usr/bin/* usr/bin 
 	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp \
                 usr/lib/xen/bin/xc* usr/lib/xen/bin
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp \
+                usr/lib/xen/bin/xen-*fb usr/lib/xen/bin
 	dh_installinit -p xen-utils-$(MAJOR) --name xend -- defaults 20 21
 	dh_installinit -p xen-utils-$(MAJOR) --name xendomains --no-restart-on-upgrade -- defaults 21 20
 	dh_installdirs -p$(PACKAGE_NAME_UTILS) var/log/xen
@@ -130,6 +132,8 @@
 		usr/lib/python2.5/* usr/lib/python2.5
 	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_LIBS) --sourcedir=debian/tmp \
 		usr/lib/lib*.so.* usr/lib
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_LIBS) --sourcedir=debian/tmp \
+		usr/lib/fs usr/lib
 
 	install -d $(CURDIR)/debian/tmp/usr/include
 	install $(BUILD_DIR)/build-tools/tools/xenstore/xs*.h $(CURDIR)/debian/tmp/usr/include