diff --git a/rpm_spec/gui-agent.spec.in b/rpm_spec/gui-agent.spec.in
index d3b56090..534b906a 100644
--- a/rpm_spec/gui-agent.spec.in
+++ b/rpm_spec/gui-agent.spec.in
@@ -38,6 +38,7 @@ URL:		http://www.qubes-os.org
 
 %define pa_ver_full %((pkg-config --modversion libpulse 2>/dev/null || echo 0.0) | cut -d "-" -f 1)
 %define pa_ver_major_minor %((pkg-config --modversion libpulse 2>/dev/null || echo 0.0) | cut -d "-" -f 1 | cut -d "." -f 1,2)
+%define backend_vmm @BACKEND_VMM@
 
 BuildRequires:	gcc
 BuildRequires:	libX11-devel
@@ -52,7 +53,9 @@ BuildRequires:	pam-devel
 BuildRequires:	qubes-libvchan-devel
 BuildRequires:	qubes-gui-common-devel >= 4.1.0
 BuildRequires:	qubes-db-devel
+%if "%{?backend_vmm}" == "xen"
 BuildRequires:	xen-devel
+%endif
 Requires:	Xorg %(xserver-sdk-abi-requires ansic)
 Requires:	Xorg %(xserver-sdk-abi-requires videodrv)
 Requires:	libXfixes
diff --git a/xf86-video-dummy/src/dummy.h b/xf86-video-dummy/src/dummy.h
index 336118d4..764498d6 100644
--- a/xf86-video-dummy/src/dummy.h
+++ b/xf86-video-dummy/src/dummy.h
@@ -13,7 +13,7 @@
 
 #include "compat-api.h"
 
-#include <xengnttab.h>
+//#include <xengnttab.h>
 #include "../../xf86-qubes-common/include/xf86-qubes-common.h"
 
 #define DUMMY_MAX_SCREENS 16
@@ -86,7 +86,7 @@ typedef struct dummyRec
     Bool        (*CreateWindow)() ;     /* wrapped CreateWindow */
     Bool prop;
 
-    xengntshr_handle *xgs;
+    //xengntshr_handle *xgs;
     uint32_t gui_domid;
 } DUMMYRec, *DUMMYPtr;
 
diff --git a/xf86-video-dummy/src/dummy_driver.c b/xf86-video-dummy/src/dummy_driver.c
index e9a950ca..e37845a1 100644
--- a/xf86-video-dummy/src/dummy_driver.c
+++ b/xf86-video-dummy/src/dummy_driver.c
@@ -3,6 +3,8 @@
  * Copyright 2002, SuSE Linux AG, Author: Egbert Eich
  */
 
+#if 0
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -1283,3 +1285,5 @@ dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr)
             return FALSE;
     }
 }
+
+#endif