diff --git a/.gitignore b/.gitignore
index 4e9469c..7623c6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@ lwip-1.3.0.tar.gz
 pciutils-2.2.9.tar.bz2
 zlib-1.2.3.tar.gz
 polarssl-1.1.4-gpl.tgz
-/xen-4.3.2.tar.gz
+/xen-4.4.0.tar.gz
diff --git a/blktapctrl.service b/blktapctrl.service
deleted file mode 100644
index b5c7c2c..0000000
--- a/blktapctrl.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=blktapctrl daemon
-Requires=proc-xen.mount
-After=proc-xen.mount
-RefuseManualStop=true
-ConditionPathExists=/proc/xen
-
-[Service]
-Type=forking
-Environment=BLKTAPCTRL_ARGS=
-EnvironmentFile=-/etc/sysconfig/blktapctrl
-ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=/usr/sbin/blktapctrl $BLKTAPCTRL_ARGS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/init.blktapctrl b/init.blktapctrl
deleted file mode 100755
index c67713e..0000000
--- a/init.blktapctrl
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-#
-# blktapctrl	Script to start the Xen blktapctrl daemon
-#
-# Author:       Daniel Berrange <berrange@redhat.com>
-#
-# chkconfig: 2345 97 01
-# description: Starts and stops the Xen blktapctrl daemon.
-### BEGIN INIT INFO
-# Provides:          blktapctrl
-# Required-Start:    $syslog $remote_fs
-# Should-Start:
-# Required-Stop:     $syslog $remote_fs
-# Should-Stop:
-# Default-Start:     3 4 5
-# Default-Stop:      0 1 2 6
-# Default-Enabled:   yes
-# Short-Description: Start/stop blktapctrl
-# Description:       Starts and stops the Xen blktapctrl daemon
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-if [ ! -d /proc/xen ]; then
-	exit 0
-fi
-if ! grep -q "control_d" /proc/xen/capabilities ; then
-	exit 0
-fi
-
-# Default config params
-BLKTAPCTRL_ARGS=
-
-# User customized params
-test -f /etc/sysconfig/blktapctrl && . /etc/sysconfig/blktapctrl
-
-start() {
-	echo -n $"Starting xen blktapctrl daemon: "
-        /usr/sbin/blktapctrl $BLKTAPCTRL_ARGS
-	RETVAL=$?
-	test $RETVAL = 0 && echo_success || echo_failure
-        echo
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/blktapctrl
-}
-
-stop() {
-	echo -n $"Stoping xen blktapctrl daemon: "
-	# blktapctrl is not restartable.  So we refuse to stop it
-	# unless the machine is being shutdown or rebooted anyway.
-	if test "$runlevel" = "0" -o "$runlevel" = "6"; then
-		killproc xenstored > /dev/null
-		RETVAL=$?
-	else
-		RETVAL=1
-	fi
-	test $RETVAL = 0 && echo_success || echo_failure
-        echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/blktapctrl
-}
-
-rcstatus() {
-        status blktapctrl
-        RETVAL=$?
-	test $RETVAL = 0 && echo_success || echo_failure
-	echo
-}
-
-
-RETVAL=0
-case "$1" in
-  start)
-        start
-	;;
-  stop)
-        stop
-	;;
-  status)
-        rcstatus
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|status}"
-	exit 1
-esac
-
-exit $RETVAL
-
diff --git a/oxenstored.service b/oxenstored.service
index 915c0aa..9953b93 100644
--- a/oxenstored.service
+++ b/oxenstored.service
@@ -15,6 +15,7 @@ PIDFile=/var/run/xenstored.pid
 ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
 ExecStart=/usr/sbin/oxenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS
 ExecStartPost=-/usr/bin/xenstore-write "/local/domain/0/name" "Domain-0"
+ExecStartPost=-/usr/bin/xenstore-write "/local/domain/0/domid" 0
 
 [Install]
 WantedBy=multi-user.target
diff --git a/qemu-xen.tradonly.patch b/qemu-xen.tradonly.patch
deleted file mode 100644
index e39f3f3..0000000
--- a/qemu-xen.tradonly.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xen-4.2.0/tools/Makefile.orig	2012-05-27 20:29:17.372660785 +0100
-+++ xen-4.2.0/tools/Makefile	2012-05-27 20:38:24.066826167 +0100
-@@ -35,7 +35,7 @@
- # do not recurse in to a dir we are about to delete
- ifneq "$(MAKECMDGOALS)" "distclean"
- SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir
--SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir
-+#SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir
- endif
- 
- SUBDIRS-y += xenpmd
diff --git a/sources b/sources
index 76174f1..b1c6d73 100644
--- a/sources
+++ b/sources
@@ -4,4 +4,4 @@ bf8f1f9e3ca83d732c00a79a6ef29bc4  newlib-1.16.0.tar.gz
 cec05e7785497c5e19da2f114b934ffd  pciutils-2.2.9.tar.bz2
 debc62758716a169df9f62e6ab2bc634  zlib-1.2.3.tar.gz
 7b72caf22b01464ee7d6165f2fd85f44  polarssl-1.1.4-gpl.tgz
-83e0e13678383e4fbcaa69ce6064b187  xen-4.3.2.tar.gz
+fd9031d499af38c5d04108681734027e  xen-4.4.0.tar.gz
diff --git a/sysconfig.blktapctrl b/sysconfig.blktapctrl
deleted file mode 100755
index bb6c09d..0000000
--- a/sysconfig.blktapctrl
+++ /dev/null
@@ -1 +0,0 @@
-#BLKTAPCTRL_ARGS=
diff --git a/xen-initscript.patch b/xen-initscript.patch
index b0112e5..4a571b5 100644
--- a/xen-initscript.patch
+++ b/xen-initscript.patch
@@ -1,5 +1,5 @@
---- xen-4.2.1/tools/misc/xend.orig	2012-12-17 15:01:18.000000000 +0000
-+++ xen-4.2.1/tools/misc/xend	2013-01-22 21:26:39.387953003 +0000
+--- xen-4.4.0/tools/python/xen/xend/xend.orig	2012-12-17 15:01:18.000000000 +0000
++++ xen-4.4.0/tools/python/xen/xend/xend	2013-01-22 21:26:39.387953003 +0000
 @@ -8,103 +8,18 @@
  """Xen management daemon.
     Provides console server and HTTP management api.
diff --git a/xen.console.fix.patch b/xen.console.fix.patch
new file mode 100644
index 0000000..186f2e0
--- /dev/null
+++ b/xen.console.fix.patch
@@ -0,0 +1,95 @@
+If xenconsole (the client program) fails, it calls err.  This would
+previously neglect to reset the user's terminal to sanity.  Use atexit
+to do so.
+
+This routinely happens in Xen 4.4 RC5 with pygrub because something
+writes the value "" to the tty xenstore key when using xenconsole.
+The cause of this is not yet known, but after this patch it just
+results in a harmless error message.
+
+Reported-by: M A Young <m.a.young@xxxxxxxxxxxx>
+Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
+CC: M A Young <m.a.young@xxxxxxxxxxxx>
+CC: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
+CC: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
+---
+ tools/console/client/main.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/tools/console/client/main.c b/tools/console/client/main.c
+index eb6a1a9..62159f6 100644
+--- a/tools/console/client/main.c
++++ b/tools/console/client/main.c
+@@ -257,6 +257,13 @@ typedef enum {
+        CONSOLE_SERIAL,
+ } console_type;
+ 
++static struct termios stdin_old_attr;
++
++static void restore_term_stdin(void)
++{
++       restore_term(STDIN_FILENO, &stdin_old_attr);
++}
++
+ int main(int argc, char **argv)
+ {
+ 	struct termios attr;
+@@ -383,9 +390,9 @@ int main(int argc, char **argv)
+ 	}
+ 
+ 	init_term(spty, &attr);
+-	init_term(STDIN_FILENO, &attr);
++	init_term(STDIN_FILENO, &stdin_old_attr);
++	 atexit(restore_term_stdin); /* if this fails, oh dear */
+ 	console_loop(spty, xs, path);
+-	restore_term(STDIN_FILENO, &attr);
+ 
+ 	free(path);
+ 	free(dom_path);
+-- 
+1.7.10.4
+Since 28d386fc4341 (XSA-57), libxl writes an empty value for the
+console tty node, with read-only permission for the guest, when
+setting up pv console "frontends".  (The actual tty value is later set
+by xenconsoled.)   Writing an empty node is not strictly necessary to
+stop the frontend from writing dangerous values here, but it is a good
+belt-and-braces approach.
+
+Unfortunately this confuses xenconsole.  It reads the empty value, and
+tries to open it as the tty.  xenconsole then exits.
+
+Fix this by having xenconsole treat an empty value the same way as no
+value at all.
+
+Also, make the error opening the tty be nonfatal: we just print a
+warning, but do not exit.  I think this is helpful in theoretical
+situations where xenconsole is racing with libxl and/or xenconsoled.
+
+Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
+CC: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
+CC: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
+---
+ tools/console/client/main.c |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/tools/console/client/main.c b/tools/console/client/main.c
+index 62159f6..b882345 100644
+--- a/tools/console/client/main.c
++++ b/tools/console/client/main.c
+@@ -115,9 +115,11 @@ static int get_pty_fd(struct xs_handle *xs, char *path, int seconds)
+ 			 * disambiguate: just read the pty path */
+ 			pty_path = xs_read(xs, XBT_NULL, path, &len);
+ 			if (pty_path != NULL) {
+-				pty_fd = open(pty_path, O_RDWR | O_NOCTTY);
+-				if (pty_fd == -1)
+-					err(errno, "Could not open tty `%s'", pty_path);
++				if (pty_path[0] != '\0') {
++					pty_fd = open(pty_path, O_RDWR | O_NOCTTY);
++					if (pty_fd == -1)
++						warn("Could not open tty `%s'", pty_path);
++				}
+ 				free(pty_path);
+ 			}
+ 		}
+-- 
+1.7.10.4
diff --git a/xen.spec b/xen.spec
index 42d96b6..561c146 100644
--- a/xen.spec
+++ b/xen.spec
@@ -39,13 +39,15 @@
 %else
 %define with_systemd 0
 %endif
+# don't build xend unless rpmbuild was run with --with xend
+%define build_xend %{?_with_xend: 1} %{?!_with_xend: 0}
 
 # Hypervisor ABI
-%define hv_abi  4.3
+%define hv_abi  4.4
 
 Summary: Xen is a virtual machine monitor
 Name:    xen
-Version: 4.3.2
+Version: 4.4.0
 Release: 1%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
@@ -63,17 +65,14 @@ Source15: polarssl-1.1.4-gpl.tgz
 # init.d bits
 Source20: init.xenstored
 Source21: init.xenconsoled
-Source22: init.blktapctrl
 Source23: init.xend
 # sysconfig bits
 Source30: sysconfig.xenstored
 Source31: sysconfig.xenconsoled
-Source32: sysconfig.blktapctrl
 # systemd bits
 Source40: proc-xen.mount
 Source41: var-lib-xenstored.mount
 Source42: xenstored.service
-Source43: blktapctrl.service
 Source44: xend.service
 Source45: xenconsoled.service
 Source46: xen-watchdog.service
@@ -90,14 +89,13 @@ Patch10: pygrubfix.patch
 Patch11: xend.catchbt.patch
 Patch12: xend-pci-loop.patch
 Patch13: xend.selinux.fixes.patch
-Patch14: xen.use.fedora.seabios.patch
 Patch15: xen.use.fedora.ipxe.patch
-Patch16: qemu-xen.tradonly.patch
 Patch17: xen.fedora.efi.build.patch
 Patch18: xen.fedora19.buildfix.patch
 Patch19: xen.pygrubtitlefix.patch
 Patch20: xen.xsm.enable.patch
 Patch21: xen.64.bit.hyp.on.ix86.patch
+Patch22: xen.console.fix.patch
 
 Patch100: xen-configure-xend.patch
 
@@ -266,9 +264,7 @@ manage Xen virtual machines.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 %patch15 -p1
-%patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
@@ -278,6 +274,7 @@ manage Xen virtual machines.
 %if %build_crosshyp
 %patch21 -p1
 %endif
+%patch22 -p1
 
 %patch100 -p1
 
@@ -293,10 +290,13 @@ cp -v %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} st
 %define efi_flags LD_EFI=/usr/x86_64-w64-mingw32/bin/ld
 mkdir -p dist/install/boot/efi/efi/fedora
 %endif
+%if %build_xend
+%define xend_opt --enable-xend
+%endif
 export XEN_VENDORVERSION="-%{release}"
 export CFLAGS="$RPM_OPT_FLAGS"
 make %{?_smp_mflags} %{?efi_flags} prefix=/usr dist-xen
-./configure --libdir=%{_libdir}
+./configure --libdir=%{_libdir} --with-system-seabios=/usr/share/seabios/bios.bin --with-system-qemu=/usr/bin/qemu-system-i386 %{?xend_opt}
 make %{?_smp_mflags} %{?ocaml_flags} prefix=/usr dist-tools
 make                 prefix=/usr dist-docs
 unset CFLAGS
@@ -396,12 +396,15 @@ install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %if %with_sysv
 install -m 755 %{SOURCE20} %{buildroot}%{_sysconfdir}/rc.d/init.d/xenstored
 install -m 755 %{SOURCE21} %{buildroot}%{_sysconfdir}/rc.d/init.d/xenconsoled
-install -m 755 %{SOURCE22} %{buildroot}%{_sysconfdir}/rc.d/init.d/blktapctrl
+%if %build_xend
 install -m 755 %{SOURCE23} %{buildroot}%{_sysconfdir}/rc.d/init.d/xend
+%endif
 %else
 rm %{buildroot}%{_sysconfdir}/rc.d/init.d/xen-watchdog
 rm %{buildroot}%{_sysconfdir}/rc.d/init.d/xencommons
+%if %build_xend
 rm %{buildroot}%{_sysconfdir}/rc.d/init.d/xend
+%endif
 rm %{buildroot}%{_sysconfdir}/rc.d/init.d/xendomains
 %endif
 
@@ -409,7 +412,6 @@ rm %{buildroot}%{_sysconfdir}/rc.d/init.d/xendomains
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 install -m 644 %{SOURCE30} %{buildroot}%{_sysconfdir}/sysconfig/xenstored
 install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/sysconfig/xenconsoled
-install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/sysconfig/blktapctrl
 
 # systemd
 %if %with_systemd
@@ -417,8 +419,9 @@ mkdir -p %{buildroot}%{_unitdir}
 install -m 644 %{SOURCE40} %{buildroot}%{_unitdir}/proc-xen.mount
 install -m 644 %{SOURCE41} %{buildroot}%{_unitdir}/var-lib-xenstored.mount
 install -m 644 %{SOURCE42} %{buildroot}%{_unitdir}/xenstored.service
-install -m 644 %{SOURCE43} %{buildroot}%{_unitdir}/blktapctrl.service
+%if %build_xend
 install -m 644 %{SOURCE44} %{buildroot}%{_unitdir}/xend.service
+%endif
 install -m 644 %{SOURCE45} %{buildroot}%{_unitdir}/xenconsoled.service
 install -m 644 %{SOURCE46} %{buildroot}%{_unitdir}/xen-watchdog.service
 install -m 644 %{SOURCE47} %{buildroot}%{_unitdir}/xendomains.service
@@ -431,8 +434,10 @@ install -m 644 %{SOURCE49} %{buildroot}/usr/lib/tmpfiles.d/xen.conf
 install -m 644 %{SOURCE50} %{buildroot}%{_unitdir}/oxenstored.service
 %endif
 
+%if %build_xend
 # config file only used for hotplug, Fedora uses udev instead
 rm -f %{buildroot}/%{_sysconfdir}/sysconfig/xend
+%endif
 
 ############ create dirs in /var ############
 
@@ -468,7 +473,9 @@ done
 
 %post
 %if %with_sysv
+%if %build_xend
 /sbin/chkconfig --add xend
+%endif
 /sbin/chkconfig --add xendomains
 %endif
 %if %with_systemd
@@ -478,15 +485,19 @@ fi
 %endif
 
 %if %with_sysv
+%if %build_xend
 if [ $1 != 0 ]; then
   service xend condrestart
 fi
 %endif
+%endif
 
 %preun
 if [ $1 == 0 ]; then
 %if %with_sysv
+%if %build_xend
   /sbin/chkconfig --del xend
+%endif
   /sbin/chkconfig --del xendomains
 %endif
 %if %with_systemd
@@ -498,7 +509,6 @@ fi
 %if %with_sysv
 /sbin/chkconfig --add xenconsoled
 /sbin/chkconfig --add xenstored
-#/sbin/chkconfig --add blktapctrl
 %endif
 %if %with_systemd
 if [ $1 == 1 ]; then
@@ -518,7 +528,6 @@ if [ $1 == 0 ]; then
 %if %with_sysv
   /sbin/chkconfig --del xenconsoled
   /sbin/chkconfig --del xenstored
-  /sbin/chkconfig --del blktapctrl
 %endif
 %if %with_systemd
   /bin/systemctl disable xenstored.service
@@ -566,42 +575,56 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc COPYING README
 %{_bindir}/xencons
+%if %build_xend
 %{_sbindir}/xend
 %{_sbindir}/xm
+%endif
 %{python_sitearch}/%{name}
 %{python_sitearch}/xen-*.egg-info
 %{_mandir}/man1/xm.1*
 %{_mandir}/man5/xend-config.sxp.5*
 %{_mandir}/man5/xmdomain.cfg.5*
+%if %build_xend
 %{_datadir}/%{name}/create.dtd
+%endif
 
 # Startup script
 %if %with_sysv
+%if %build_xend
 %{_sysconfdir}/rc.d/init.d/xend
+%endif
 %{_sysconfdir}/rc.d/init.d/xendomains
 %endif
 # Guest config files
+%if %build_xend
 %config(noreplace) %{_sysconfdir}/%{name}/xmexample*
+%endif
 # Daemon config
+%if %build_xend
 %config(noreplace) %{_sysconfdir}/%{name}/xend-*
 # xm config
 %config(noreplace) %{_sysconfdir}/%{name}/xm-*
+%endif
 # Guest autostart links
 %dir %attr(0700,root,root) %{_sysconfdir}/%{name}/auto
 # Autostart of guests
 %config(noreplace) %{_sysconfdir}/sysconfig/xendomains
 
 %if %with_systemd
+%if %build_xend
 %{_unitdir}/xend.service
+%endif
 %{_unitdir}/xendomains.service
 %{_libexecdir}/xendomains
 %endif
 
+%if %build_xend
 # Persistent state for XenD
 %dir %{_localstatedir}/lib/%{name}/xend-db/
 %dir %{_localstatedir}/lib/%{name}/xend-db/domain
 %dir %{_localstatedir}/lib/%{name}/xend-db/migrate
 %dir %{_localstatedir}/lib/%{name}/xend-db/vnet
+%endif
 
 %files libs
 %defattr(-,root,root)
@@ -619,7 +642,6 @@ rm -rf %{buildroot}
 %config %attr(0700,root,root) %{_sysconfdir}/%{name}/scripts/*
 
 %if %with_sysv
-%{_sysconfdir}/rc.d/init.d/blktapctrl
 %{_sysconfdir}/rc.d/init.d/xenstored
 %{_sysconfdir}/rc.d/init.d/xenconsoled
 %{_sysconfdir}/rc.d/init.d/xen-watchdog
@@ -631,7 +653,6 @@ rm -rf %{buildroot}
 %{_unitdir}/proc-xen.mount
 %{_unitdir}/var-lib-xenstored.mount
 %{_unitdir}/xenstored.service
-%{_unitdir}/blktapctrl.service
 %{_unitdir}/xenconsoled.service
 %{_unitdir}/xen-watchdog.service
 /usr/lib/tmpfiles.d/xen.conf
@@ -639,7 +660,6 @@ rm -rf %{buildroot}
 
 %config(noreplace) %{_sysconfdir}/sysconfig/xenstored
 %config(noreplace) %{_sysconfdir}/sysconfig/xenconsoled
-%config(noreplace) %{_sysconfdir}/sysconfig/blktapctrl
 %config(noreplace) %{_sysconfdir}/sysconfig/xencommons
 %config(noreplace) %{_sysconfdir}/xen/xl.conf
 %config(noreplace) %{_sysconfdir}/xen/cpupool
@@ -668,6 +688,7 @@ rm -rf %{buildroot}
 %{_mandir}/man5/xl.cfg.5*
 %{_mandir}/man5/xl.conf.5*
 %{_mandir}/man5/xlcpupool.cfg.5*
+%{_mandir}/man1/xenstore*
 
 %{python_sitearch}/fsimage.so
 %{python_sitearch}/grub
@@ -699,9 +720,11 @@ rm -rf %{buildroot}
 %dir %{_localstatedir}/lib/xenstored
 # Xenstore runtime state
 %ghost %{_localstatedir}/run/xenstored
+%if build_xend
 # XenD runtime state
 %ghost %attr(0700,root,root) %{_localstatedir}/run/xend
 %ghost %attr(0700,root,root) %{_localstatedir}/run/xend/boot
+%endif
 
 # All xenstore CLI tools
 %{_bindir}/qemu-*-xen
@@ -711,7 +734,6 @@ rm -rf %{buildroot}
 %{_bindir}/xentrace*
 %{_bindir}/remus
 # blktap daemon
-%{_sbindir}/blktapctrl
 %{_sbindir}/tapdisk*
 # XSM
 %{_sbindir}/flask-*
@@ -746,10 +768,10 @@ rm -rf %{buildroot}
 %{_sbindir}/xenperf
 %{_sbindir}/xenwatchdogd
 %{_sbindir}/xl
-%{_sbindir}/xsview
 %{_sbindir}/xen-lowmemd
 %{_sbindir}/xen-ringwatch
 %{_sbindir}/xencov
+%{_sbindir}/xen-mfndump
 
 # Xen logfiles
 %dir %attr(0700,root,root) %{_localstatedir}/log/xen
@@ -810,6 +832,21 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sun Mar 23 2014 Michael Young <m.a.young@durham.ac.uk> - 4.4.0-1
+- update to xen-4.4.0
+- adjust xend.selinux.fixes.patch and xen-initscript.patch as xend has moved
+- don't build xend unless --with xend is specified
+- use --with-system-seabios option instead of xen.use.fedora.seabios.patch
+- update xen.use.fedora.ipxe.patch patch
+- replace qemu-xen.tradonly.patch with --with-system-qemu= option pointing
+  to Fedora's qemu-system-i386
+- adjust xen.xsm.enable.patch and remove bits that are are no longer needed
+- blktapctrl is no longer built, remove related files
+- adjust files to be packaged; xsview has gone, add xen-mfndump and
+  xenstore man pages
+- add another xenstore-write to xenstored.service and oxenstored.service
+- Add xen.console.fix.patch to fix issues running pygrub
+
 * Tue Feb 18 2014 Michael Young <m.a.young@durham.ac.uk> - 4.3.2-1
 - update to xen-4.3.2
   includes fix for "Excessive time to disable caching with HVM guests with
diff --git a/xen.use.fedora.ipxe.patch b/xen.use.fedora.ipxe.patch
index 902c9ac..e2b8116 100644
--- a/xen.use.fedora.ipxe.patch
+++ b/xen.use.fedora.ipxe.patch
@@ -12,8 +12,8 @@
 --- xen-4.2.0/Config.mk.orig	2012-05-27 21:57:04.479812884 +0100
 +++ xen-4.2.0/Config.mk	2012-06-02 18:55:14.087169469 +0100
 @@ -206,7 +206,7 @@
- # Wed Jun 26 16:30:45 2013 +0100
- # xen: Don't perform SMP setup.
+ # Fri Aug 2 14:12:09 2013 -0400
+ # Fix bug in CBFS file walking with compressed files.
  
 -ETHERBOOT_NICS ?= rtl8139 8086100e
 +ETHERBOOT_NICS ?= 10ec8139 8086100e
@@ -23,11 +23,11 @@
 --- xen-4.2.0/tools/firmware/Makefile.orig	2012-05-27 21:57:04.480812871 +0100
 +++ xen-4.2.0/tools/firmware/Makefile	2012-06-02 19:03:52.254691484 +0100
 @@ -10,7 +10,7 @@
- #SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
+ endif
  SUBDIRS-$(CONFIG_ROMBIOS) += rombios
  SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
 -SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
 +#SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
  SUBDIRS-y += hvmloader
  
- ovmf:
+ ovmf-dir:
diff --git a/xen.use.fedora.seabios.patch b/xen.use.fedora.seabios.patch
deleted file mode 100644
index 86d46aa..0000000
--- a/xen.use.fedora.seabios.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xen-4.2.0/tools/firmware/Makefile.orig	2012-05-12 16:40:47.000000000 +0100
-+++ xen-4.2.0/tools/firmware/Makefile	2012-05-27 21:55:23.438076078 +0100
-@@ -7,7 +7,7 @@
- 
- SUBDIRS-y :=
- SUBDIRS-$(CONFIG_OVMF) += ovmf
--SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
-+#SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
- SUBDIRS-$(CONFIG_ROMBIOS) += rombios
- SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
- SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
---- xen-4.2.0/tools/firmware/hvmloader/Makefile.orig	2012-05-12 16:40:47.000000000 +0100
-+++ xen-4.2.0/tools/firmware/hvmloader/Makefile	2012-05-27 21:53:45.625298906 +0100
-@@ -70,7 +70,7 @@
- ifeq ($(CONFIG_SEABIOS),y)
- OBJS += seabios.o
- CFLAGS += -DENABLE_SEABIOS
--SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin
-+SEABIOS_ROM := /usr/share/seabios/bios.bin
- ROMS += $(SEABIOS_ROM)
- endif
- 
diff --git a/xen.xsm.enable.patch b/xen.xsm.enable.patch
index e414393..ade8c3f 100644
--- a/xen.xsm.enable.patch
+++ b/xen.xsm.enable.patch
@@ -8,19 +8,4 @@
 +XSM_ENABLE ?= y
  FLASK_ENABLE ?= $(XSM_ENABLE)
  
- XEN_EXTFILES_URL=http://xenbits.xen.org/xen-extfiles
---- xen-4.3.0-rc5/xen/xsm/flask/hooks.c.orig	2013-06-16 20:22:09.000000000 +0100
-+++ xen-4.3.0-rc5/xen/xsm/flask/hooks.c	2013-06-23 13:30:00.303843347 +0100
-@@ -1577,6 +1577,12 @@
-         return 0;
-     }
- 
-+    if ( !policy_buffer )
-+    {
-+        printk("Flask:  No policy file found. Disabling Flask.\n");
-+        return 0;
-+    }
-+
-     printk("Flask:  Initializing.\n");
- 
-     avc_init();
+ XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles
diff --git a/xend.selinux.fixes.patch b/xend.selinux.fixes.patch
index 61be90e..abdeece 100644
--- a/xend.selinux.fixes.patch
+++ b/xend.selinux.fixes.patch
@@ -10,8 +10,8 @@
              return 0
          except KeyError:
              print >>sys.stderr, "Error: no such user '%s'" % XEND_USER
---- xen-4.1.2/tools/misc/xend.orig	2012-08-07 00:54:02.372867624 +0100
-+++ xen-4.1.2/tools/misc/xend	2012-08-07 00:58:11.469753483 +0100
+--- xen-4.4.0/tools/python/xen/xend/xend.orig	2012-08-07 00:54:02.372867624 +0100
++++ xen-4.4.0/tools/python/xen/xend/xend	2012-08-07 00:58:11.469753483 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python -Es
diff --git a/xenstored.service b/xenstored.service
index 6d7ef9e..b573330 100644
--- a/xenstored.service
+++ b/xenstored.service
@@ -14,6 +14,7 @@ PIDFile=/var/run/xenstored.pid
 ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
 ExecStart=/usr/sbin/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS
 ExecStartPost=-/usr/bin/xenstore-write "/local/domain/0/name" "Domain-0"
+ExecStartPost=-/usr/bin/xenstore-write "/local/domain/0/domid" 0
 
 [Install]
 WantedBy=multi-user.target