diff --git a/ChangeLog b/ChangeLog
index b09c458ff8..6bb1114cdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec  9 11:15:41 CET 2005 Daniel Veillard <veillard@redhat.com>
+
+	* configure.in: adding --without-depends to make dist on non
+	  Xenified machine.
+
 Fri Dec  9 00:47:12 CET 2005 Daniel Veillard <veillard@redhat.com>
 
 	* Makefile.am include/libvir.h.in libvir.pc.in: various fixes.
diff --git a/configure.in b/configure.in
index 9fd8e25516..98bb907405 100644
--- a/configure.in
+++ b/configure.in
@@ -78,6 +78,15 @@ dnl
 	CFLAGS="-g -O -W -Wformat -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls -Wall"
     fi
 
+dnl
+dnl To be able to make dist on a non-xenified host
+dnl
+AC_ARG_WITH(depends,
+[  --with-depends          check for dependancies (on)])
+
+if test "$with_depends" != "no"
+then
+
 dnl search for the Xen store library
 AC_SEARCH_LIBS(xs_read, [xenstore], [], [AC_MSG_ERROR([Xen store library not found])])
 
@@ -92,5 +101,8 @@ AC_CHECK_LIB(readline, main,
 	[$VIRSH_LIBS])
 AC_SUBST(VIRSH_LIBS)
 
+# end of if with_depends
+fi
+
 AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \
           libvir.pc libvir.spec include/libvir.h)