diff --git a/ChangeLog b/ChangeLog
index f996e7b6be..98342aae66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Nov 26 11:42:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+	* configure.in: Check if -lrpc is needed to get XDR functions.
+
+Mon Nov 26 11:39:59 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+	* configure.in, src/internal.h, src/xml.c: <sys/syslimits.h>
+	  is needed on Cygwin to get PATH_MAX.  HOST_NAME_MAX and
+	  IF_NAMESIZE defined if not in header files.
+
 Mon Nov 26 11:39:04 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
 
 	* configure.in: Minimum version of GnuTLS we support is 1.0.25.
diff --git a/configure.in b/configure.in
index d13c3f2ab7..925cf14ad4 100644
--- a/configure.in
+++ b/configure.in
@@ -66,6 +66,9 @@ AC_CHECK_FUNCS([regexec])
 dnl Availability of various common headers (non-fatal if missing).
 AC_CHECK_HEADERS([paths.h sys/syslimits.h])
 
+dnl Need -lrpc? (Cygwin needs this)
+AC_SEARCH_LIBS(xdrmem_create,rpc)
+
 dnl Specific dir for HTML output ?
 AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=path],
             [path to base html directory, default $datadir/doc/html]),