diff --git a/Makefile b/Makefile
index eb0ff9a2..1cc7fec6 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,10 @@ install-vm: all-vm
 	install -m 0644 -D qubes-rpc-config/README $(DESTDIR)/etc/qubes/rpc-config/README
 #	install -d $(DESTDIR)/etc/qubes-rpc -m 755
 #	install -t $(DESTDIR)/etc/qubes-rpc -m 755 qubes-rpc/*
+#### KVM:
+	install -d $(DESTDIR)/lib/systemd/system/qubes-qrexec-agent.service.d -m 755
+	install -t $(DESTDIR)/lib/systemd/system/qubes-qrexec-agent.service.d -m 644 systemd/qubes-qrexec-agent.service.d/30_qubes-kvm.conf
+########
 .PHONY: install-vm
 
 all: all-vm all-dom0
diff --git a/debian/control b/debian/control
index d7d90083..f4d23e1b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: unman <unman@thirdeyesecurity.org>
 Build-Depends:
  debhelper,
  libpam0g-dev,
- libvchan-xen-dev,
+ libvchan-xen-dev|libvchan-kvm-dev,
  pkg-config,
  dh-python,
  lsb-release,
@@ -18,10 +18,10 @@ Homepage: https://www.qubes-os.org
 
 Package: qubes-core-qrexec
 Architecture: any
-Depends: 
- libvchan-xen,
+Depends:
+ libvchan-xen|libvchan-kvm-dev,
  libqrexec-utils2 (= ${binary:Version}),
- ${shlibs:Depends}, 
+ ${shlibs:Depends},
  ${misc:Depends}
 Replaces: qubes-core-agent-qrexec (<< 4.1.0-1)
 Breaks:
diff --git a/rpm_spec/qubes-qrexec-vm.spec.in b/rpm_spec/qubes-qrexec-vm.spec.in
index aa2f87af..79f0320f 100644
--- a/rpm_spec/qubes-qrexec-vm.spec.in
+++ b/rpm_spec/qubes-qrexec-vm.spec.in
@@ -104,6 +104,10 @@ fi
 /usr/lib/qubes/qrexec-client-vm
 /usr/lib/qubes/qrexec_client_vm
 /lib/systemd/system/qubes-qrexec-agent.service
+#### KVM:
+%dir /lib/systemd/system/qubes-qrexec-agent.service.d
+/lib/systemd/system/qubes-qrexec-agent.service.d/30_qubes-kvm.conf
+########
 
 %changelog
 @CHANGELOG@
diff --git a/systemd/qubes-qrexec-agent.service.d/30_qubes-kvm.conf b/systemd/qubes-qrexec-agent.service.d/30_qubes-kvm.conf
new file mode 100644
index 00000000..cb82e1fc
--- /dev/null
+++ b/systemd/qubes-qrexec-agent.service.d/30_qubes-kvm.conf
@@ -0,0 +1,10 @@
+[Unit]
+ConditionPathExists=/var/run/qubes-service/hypervisor-kvm
+# No 'xendriverdomain.service' depend in KVM.
+After=
+After=kvmchand.service
+Requires=kvmchand.service
+
+[Service]
+# Prevent loading 'xen_evtchn'
+ExecStartPre=