diff --git a/modules/xen b/modules/xen
index 7279536e..949ad456 100644
--- a/modules/xen
+++ b/modules/xen
@@ -2,12 +2,12 @@ modules-$(CONFIG_XEN) += xen
 
 ifeq "$(CONFIG_XEN_VERSION)" "4.8"
 	xen_base_version := 4.8.2
-	xen_version := $(xen_base_version)-2
-	xen_hash := 866855dfbe1e7d6086738e2e82fa0475bf831f4a65df224abf6dc5589122c7d5
+	xen_version := $(xen_base_version)-9
+	xen_hash := c8d2e7d155fd35a40f8da9aab646a18b073488b6dd92b3097d70e541d4f4741e
 else
 	xen_base_version := 4.6.6
-	xen_version := $(xen_base_version)-30
-	xen_hash := 65cdbdb77d30475d77d849011343cba970b61c99d6638ccfeca4b7bbc308dc36
+	xen_version := $(xen_base_version)-34
+	xen_hash := b5cc725fc12e0885b5fb4e9f0af6516a3f3025cbe9b49ecdfa71c1c13c4ac55e
 endif
 
 # We extract the entire Xen tree, but only use the xen/xen hypervisor
diff --git a/patches/xen-4.6.6-30.patch b/patches/xen-4.6.6-34.patch
similarity index 93%
rename from patches/xen-4.6.6-30.patch
rename to patches/xen-4.6.6-34.patch
index ba65736a..1344b4dd 100644
--- a/patches/xen-4.6.6-30.patch
+++ b/patches/xen-4.6.6-34.patch
@@ -1,5 +1,5 @@
 diff --git ./Makefile ./Makefile
-index c210da9..d8f8708 100644
+index 13fa4af..0320888 100644
 --- ./Makefile
 +++ ./Makefile
 @@ -122,6 +122,7 @@ verrel:
@@ -54,18 +54,11 @@ index b1c8468..74a4c20 100755
 +do
 +	patch -s -F0 -E -p1 --no-backup-if-mismatch -i $PATCH_DIR/$i
 +done
-diff --git ./series.conf ./series.conf
-index ede01b2..109ddfb 100644
---- ./series.conf
-+++ ./series.conf
-@@ -98,3 +98,5 @@ patches.qubes/libxl-disable-forced-vkb-for-HVM.patch
- patches.qubes/xenconsoled-enable-logging.patch
- patches.qubes/vm-0001-hotplug-do-not-attempt-to-remove-containing-xenstore.patch
- patches.qubes/xen-hotplug-qubesdb-update.patch
-+
-+patches.heads/heads.patch
---- /dev/null	2017-07-08 09:18:33.906645246 -0400
-+++ ./patches.heads/heads.patch	2017-07-18 12:39:11.715840524 -0400
+diff --git ./patches.heads/heads.patch ./patches.heads/heads.patch
+new file mode 100644
+index 0000000..bb17c3d
+--- /dev/null
++++ ./patches.heads/heads.patch
 @@ -0,0 +1,68 @@
 +diff --recursive -u ../xen-4.6.5-clean/xen/arch/x86/boot/head.S ./xen/arch/x86/boot/head.S
 +--- ../xen-4.6.5-clean/xen/arch/x86/boot/head.S	2017-03-07 11:19:05.000000000 -0500
@@ -135,3 +128,13 @@ index ede01b2..109ddfb 100644
 + 		echo " Xen $(XEN_FULLVERSION)" | figlet -f tools/xen.flf > $@.tmp; \
 + 	else \
 + 		echo " Xen $(XEN_FULLVERSION)" > $@.tmp; \
+diff --git ./series.conf ./series.conf
+index 49dc710..164a4dd 100644
+--- ./series.conf
++++ ./series.conf
+@@ -112,3 +112,5 @@ patches.qubes/libxl-disable-forced-vkb-for-HVM.patch
+ patches.qubes/xenconsoled-enable-logging.patch
+ patches.qubes/vm-0001-hotplug-do-not-attempt-to-remove-containing-xenstore.patch
+ patches.qubes/xen-hotplug-qubesdb-update.patch
++
++patches.heads/heads.patch
diff --git a/patches/xen-4.8.2-2.patch b/patches/xen-4.8.2-9.patch
similarity index 97%
rename from patches/xen-4.8.2-2.patch
rename to patches/xen-4.8.2-9.patch
index dbd69d93..0aea7afc 100644
--- a/patches/xen-4.8.2-2.patch
+++ b/patches/xen-4.8.2-9.patch
@@ -115,10 +115,10 @@ index 0000000..d956f8a
 + 	else \
 + 		echo " Xen $(XEN_FULLVERSION)" > $@.tmp; \
 diff --git ./series.conf ./series.conf
-index 18fd577..56174a9 100644
+index 98eab7a..f72e088 100644
 --- ./series.conf
 +++ ./series.conf
-@@ -68,6 +68,9 @@ patches.qubes/xenconsoled-enable-logging.patch
+@@ -93,6 +93,9 @@ patches.qubes/xenconsoled-enable-logging.patch
  patches.qubes/vm-0001-hotplug-do-not-attempt-to-remove-containing-xenstore.patch
  patches.qubes/xen-hotplug-qubesdb-update.patch