diff --git a/ChangeLog b/ChangeLog
index ad7aeaee..15df0862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+Mon Sep 17 18:52:37 CEST 2001 Daniel Veillard <daniel@veillard.com>
+
+	* configure.in: Joe Orton provided a patch fixing a problem
+	  when iconv is specified to be in a non-standard directory
+	  but wasn't exported in xml2-config --cflags
+
 Fri Sep 14 19:32:43 CEST 2001 Daniel Veillard <daniel@veillard.com>
 
-	* configure.in: let's ship 2.4.5 before egtting too much
+	* configure.in: let's ship 2.4.5 before getting too much
 	  troubles with 2.4.4 errors.
 
 Fri Sep 14 12:26:58 CEST 2001 Daniel Veillard <daniel@veillard.com>
diff --git a/configure.in b/configure.in
index e53688c6..7e8a4ef3 100644
--- a/configure.in
+++ b/configure.in
@@ -377,6 +377,8 @@ if test "$with_iconv" = "no" ; then
 else
     if test "$with_iconv" != "yes" ; then
 	CPPFLAGS="${CPPFLAGS} -I$with_iconv/include"
+	# Export this since our headers include iconv.h
+	XML_INCLUDEDIR="${XML_INCLUDEDIR} -I$with_iconv/include"
 	ICONV_LIBS="-L$with_iconv/lib"
     fi