diff --git a/ChangeLog b/ChangeLog
index 369fa3f1540d6be7da319db9910852862911ae97..c43c02e5156a5abba95f2211bbec6f23db8f33b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 10 11:07:58 CET 2006 Daniel Veillard
+
+ * configure.in: applied patch for --with-xen-distdir option from
+ Ronald Aigner
+ * docs/site.xsl docs/*.html: added link to Bugzilla
+
Sat Mar 4 09:59:13 CET 2006 Daniel Veillard
* src/xml.c: another patch from David Lutterkort fixing a typo
diff --git a/configure.in b/configure.in
index 375164703da8513300d11ce52c08ff0cc4d119a9..4045cabf182144764c8bb518e73ff15d4337f6f4 100644
--- a/configure.in
+++ b/configure.in
@@ -78,6 +78,18 @@ 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 Specify the xen-distribution directory to be able to compile on a
+dnl non-xenified host
+dnl
+AC_ARG_WITH(xen-distdir, AC_HELP_STRING([--with-xen-distdir=path],
+ [distribution directory of Xen, default /usr]))
+if test "x$with_xen_distdir" != "x"
+then
+CPPFLAGS="$CPPFLAGS -I$withval/install/usr/include"
+LDFLAGS="$LDFLAGS -L$withval/install/usr/lib"
+fi
+
dnl
dnl To be able to make dist on a non-xenified host
dnl
diff --git a/docs/FAQ.html b/docs/FAQ.html
index 5680f92517680a56ac6b19e5b586ee590ba1ead2..afcd87e88a2133f32a1ed967100bd5c368b0769b 100644
--- a/docs/FAQ.html
+++ b/docs/FAQ.html
@@ -77,4 +77,4 @@
via the pkg-config command line tool, like:
pkg-config libvirt --libs
-