diff --git a/ChangeLog b/ChangeLog
index cf035b5645..8119745e85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 26 11:52:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+	* configure.in, proxy/Makefile.am: Disable building of the Xen proxy
+	  if configured --without-xen.
+
 Mon Nov 26 11:49:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
 
 	* src/bridge.c, src/bridge.h, src/qemu_conf.c, src/qemu_conf.h,
diff --git a/configure.in b/configure.in
index 61d6779e05..5c8582f764 100644
--- a/configure.in
+++ b/configure.in
@@ -504,7 +504,10 @@ if test "${enableval}" = yes; then
   COMPILER_FLAGS=
 fi
 
+dnl Enable building the proxy?
+AM_CONDITIONAL(WITH_PROXY,[test "x$with_xen" = "xyes"])
 
+dnl Check for gettext
 AM_GNU_GETTEXT_VERSION([0.14.1])
 AM_GNU_GETTEXT([external])
 if test -d po
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 90fd6bcd53..a270191fb0 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -1,5 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
+if WITH_PROXY
 INCLUDES = -I$(top_builddir)/include -I@top_srcdir@/include \
            -I@top_srcdir@/proxy -I@top_srcdir@/src @LIBXML_CFLAGS@ \
 	   -DPROXY  -DLOCALEBASEDIR=\""$(datadir)/locale"\" \
@@ -17,3 +18,4 @@ libvirt_proxy_LDADD =
 
 install-exec-hook:
 	chmod u+s $(DESTDIR)$(libexecdir)/libvirt_proxy
+endif
\ No newline at end of file