diff --git a/ChangeLog b/ChangeLog
index 07621e8..1204864 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-15  Alan Coopersmith <alan.coopersmith@sun.com>
+
+	reviewed by: Keith Packard <keithp@keithp.com>
+
+	* configure.in:
+	Have --with-expat set EXPAT_CFLAGS (bug 2278)
+
 2005-01-13  Keith Packard  <keithp@keithp.com>
 
 	* doc/fontconfig-user.sgml:
diff --git a/configure.in b/configure.in
index 7f333aa..c18a9f3 100644
--- a/configure.in
+++ b/configure.in
@@ -202,7 +202,16 @@ no)
 	;;
 *)
 	case "$expat_includes" in
-	yes|no)
+	yes)
+		case "$expat" in
+		yes)
+			;;
+		*)
+			EXPAT_CFLAGS="-I$expat/include"
+			;;
+		esac
+		;;
+	no)
 		EXPAT_CFLAGS=""
 		;;
 	*)