diff -Nru xen-4.8.0/debian/changelog xen-4.8.0/debian/changelog
--- xen-4.8.0/debian/changelog	2016-12-22 17:45:46.000000000 +0000
+++ xen-4.8.0/debian/changelog	2017-01-17 05:25:26.000000000 +0000
@@ -1,3 +1,16 @@
+xen (4.8.0-1+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 4.4.1-9+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Aug 2015 15:43:16 +0000]
+  * replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6
+  
+  [changes introduced in 4.6.0-1+rpi1 by Peter Michael Green]
+  * Use kernel 3.18 for now as I haven't dealt with 4.x yet.
+
+  [changes introduced in 4.8.0-1+rpi1 by Peter Micheal Green]
+  * Add build-depends on ghostscript.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 17 Jan 2017 05:25:26 +0000
+
 xen (4.8.0-1) unstable; urgency=high
 
   * Update to upstream Xen 4.8.0.
diff -Nru xen-4.8.0/debian/control xen-4.8.0/debian/control
--- xen-4.8.0/debian/control	2016-12-22 17:45:52.000000000 +0000
+++ xen-4.8.0/debian/control	2017-01-17 05:25:26.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Xen Team <pkg-xen-devel@lists.alioth.debian.org>
 Uploaders: Guido Trotter <ultrotter@debian.org>, Bastian Blank <waldi@debian.org>, Ian Jackson <ian.jackson@eu.citrix.com>
 Standards-Version: 3.9.4
-Build-Depends: autotools-dev, debhelper (>> 9), dpkg-dev (>= 1.16.0~), lsb-release, python-dev, bcc [i386 amd64], gcc-multilib [i386 amd64], e2fslibs-dev, iasl, seabios (>= 1.7.4-2~) [i386 amd64], libaio-dev, libfdt-dev [armhf arm64], libglib2.0-dev, liblzma-dev, libncurses5-dev, libpixman-1-dev, libyajl-dev, pkg-config, uuid-dev, zlib1g-dev
+Build-Depends: autotools-dev, debhelper (>> 9), dpkg-dev (>= 1.16.0~), lsb-release, python-dev, bcc [i386 amd64], gcc-multilib [i386 amd64], e2fslibs-dev, iasl, seabios (>= 1.7.4-2~) [i386 amd64], libaio-dev, libfdt-dev [armhf arm64], libglib2.0-dev, liblzma-dev, libncurses5-dev, libpixman-1-dev, libyajl-dev, pkg-config, uuid-dev, zlib1g-dev, ghostscript
 XS-Python-Version: current
 
 Package: libxen-4.8
diff -Nru xen-4.8.0/debian/control.md5sum xen-4.8.0/debian/control.md5sum
--- xen-4.8.0/debian/control.md5sum	2016-12-22 17:45:52.000000000 +0000
+++ xen-4.8.0/debian/control.md5sum	2017-01-17 05:25:26.000000000 +0000
@@ -1,4 +1,4 @@
-0002423665720b40f608956bb04fc6fc  debian/changelog
+783369e70251f6104b767899df4719df  debian/changelog
 dc7b5d9f0538e3180af4e9aff9b0bd57  debian/bin/gencontrol.py
 20e336dbea44b1641802eff0dde9569b  debian/templates/control.main.in
 a15fa64ce6deead28d33c1581b14dba7  debian/templates/xen-hypervisor.postinst.in
diff -Nru xen-4.8.0/debian/patches/armv6.diff xen-4.8.0/debian/patches/armv6.diff
--- xen-4.8.0/debian/patches/armv6.diff	1970-01-01 00:00:00.000000000 +0000
+++ xen-4.8.0/debian/patches/armv6.diff	2017-01-17 05:25:26.000000000 +0000
@@ -0,0 +1,20 @@
+Description:  replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+Index: xen-4.6.0/tools/libxc/include/xenctrl.h
+===================================================================
+--- xen-4.6.0.orig/tools/libxc/include/xenctrl.h
++++ xen-4.6.0/tools/libxc/include/xenctrl.h
+@@ -78,9 +78,9 @@
+ #define xen_rmb() xen_barrier()
+ #define xen_wmb() xen_barrier()
+ #elif defined(__arm__)
+-#define xen_mb()   asm volatile ("dmb" : : : "memory")
+-#define xen_rmb()  asm volatile ("dmb" : : : "memory")
+-#define xen_wmb()  asm volatile ("dmb" : : : "memory")
++#define xen_mb()   asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory")
++#define xen_rmb()  asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory")
++#define xen_wmb()  asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory")
+ #elif defined(__aarch64__)
+ #define xen_mb()   asm volatile ("dmb sy" : : : "memory")
+ #define xen_rmb()  asm volatile ("dmb sy" : : : "memory")
diff -Nru xen-4.8.0/debian/patches/series xen-4.8.0/debian/patches/series
--- xen-4.8.0/debian/patches/series	2016-12-22 17:47:20.000000000 +0000
+++ xen-4.8.0/debian/patches/series	2017-01-17 05:25:26.000000000 +0000
@@ -31,3 +31,4 @@
 x86hvm-add-missing-null-check-before-usi
 x86emul-correct-the-handling-of-eflags-w
 x86emul-add-likelyunlikely-to-test-harne
+armv6.diff
diff -Nru xen-4.8.0/debian/rules.defs xen-4.8.0/debian/rules.defs
--- xen-4.8.0/debian/rules.defs	2016-12-22 17:01:55.000000000 +0000
+++ xen-4.8.0/debian/rules.defs	2017-01-17 05:25:26.000000000 +0000
@@ -1,4 +1,4 @@
-KERNELVERSION := 4.7.0-1
+KERNELVERSION := 3.18.0-trunk
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 TEMPLATES_DIR = debian/templates