diff --git a/xen.spec b/xen.spec
index 72ab359..4a91a49 100644
--- a/xen.spec
+++ b/xen.spec
@@ -41,7 +41,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.7.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -54,6 +54,8 @@ Source12: zlib-1.2.3.tar.gz
 Source13: pciutils-2.2.9.tar.bz2
 Source14: grub-0.97.tar.gz
 Source15: polarssl-1.1.4-gpl.tgz
+# systemd file for xen driver domain
+Source20: xendriverdomain.service
 
 Patch1: xen-net-disable-iptables-on-bridge.patch
 Patch2: xen.use.fedora.ipxe.patch
@@ -486,6 +488,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 rm %{buildroot}%{_sysconfdir}/rc.d/init.d/xen-watchdog
 rm %{buildroot}%{_sysconfdir}/rc.d/init.d/xencommons
 rm %{buildroot}%{_sysconfdir}/rc.d/init.d/xendomains
+rm %{buildroot}%{_sysconfdir}/rc.d/init.d/xendriverdomain
+
+install -m 644 %{SOURCE20} %{buildroot}%{_unitdir}/xendriverdomain.service
 
 ############ create dirs in /var ############
 
@@ -651,7 +656,6 @@ rm -rf %{buildroot}
 %config %attr(0700,root,root) %{_sysconfdir}/%{name}/scripts/*
 
 %{_sysconfdir}/bash_completion.d/xl.sh
-%{_sysconfdir}/rc.d/init.d/xendriverdomain
 
 %{_unitdir}/proc-xen.mount
 %{_unitdir}/var-lib-xenstored.mount
@@ -661,6 +665,7 @@ rm -rf %{buildroot}
 %{_unitdir}/xen-qemu-dom0-disk-backend.service
 %{_unitdir}/xenstored.socket
 %{_unitdir}/xenstored_ro.socket
+%{_unitdir}/xendriverdomain.service
 /usr/lib/modules-load.d/xen.conf
 
 %config(noreplace) %{_sysconfdir}/sysconfig/xencommons
@@ -828,7 +833,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Tue Jul 26 2016 Michael Young <m.a.young@durham.ac.uk> - 4.7.0-2
+* Wed Aug 10 2016 Michael Young <m.a.young@durham.ac.uk> - 4.7.0-3
+- replace xendriverdomain sysvinit script with a systemd file (#1361324)
+
+* Wed Jul 27 2016 Michael Young <m.a.young@durham.ac.uk> - 4.7.0-2
 - x86: Privilege escalation in PV guests [XSA-182, CVE-2016-6258] (#1360358)
 - x86: Missing SMAP whitelisting in 32-bit exception / event delivery
 	[XSA-183, CVE-2016-6259] (#1360359)
diff --git a/xendriverdomain.service b/xendriverdomain.service
new file mode 100644
index 0000000..1e0c111
--- /dev/null
+++ b/xendriverdomain.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Start services within a xen driver domain
+Requires=proc-xen.mount
+After=proc-xen.mount
+ConditionPathExists=/proc/xen/capabilities
+
+[Service]
+Type=forking
+ExecStartPre=/bin/bash -c "! /bin/grep -q control_d /proc/xen/capabilities"
+EnvironmentFile=/etc/xen/scripts/hotplugpath.sh
+EnvironmentFile=-/etc/sysconfig/xendriverdomain
+PIDFile=/run/xldevd.pid
+ExecStart=/usr/sbin/xl devd --pidfile=/run/xldevd.pid ${XLDEVD_ARGS}