diff --git a/ChangeLog b/ChangeLog
index e057a3cacb..e2df39af61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-13  Rodney Dawes  <dobey@novell.com>
+
+	* configure.in: Check for et/comm-err.h and comm_err.h so that
+	we can include the correct one
+
 2004-08-12  Rodney Dawes  <dobey@novell.com>
 
 	* data/evolution.desktop.in.in: Update Name and description to
diff --git a/configure.in b/configure.in
index e6fec442da..a0b535fe7d 100644
--- a/configure.in
+++ b/configure.in
@@ -565,6 +565,9 @@ else
 	AC_MSG_RESULT($with_krb5)
 fi
 
+AC_CHECK_HEADER([et/com_err.h],[AC_DEFINE([HAVE_ET_COM_ERR_H])])
+AC_CHECK_HEADER([com_err.h],[AC_DEFINE([HAVE_COM_ERR_H])])
+
 msg_krb4="no"
 if test "x${with_krb4}" != "xno"; then
 	LDFLAGS_save="$LDFLAGS"