diff --git a/ChangeLog b/ChangeLog
index 64b6ab3ccc..3a97f5a9a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-27  Dan Winship  <danw@helixcode.com>
+
+	* configure.in: Check for gconf_client_get_default (gconf 0.5 vs
+	newer)
+
 2000-07-26  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* configure.in: Bump version number to 0.3.
diff --git a/configure.in b/configure.in
index af1f2387c2..5172569c72 100644
--- a/configure.in
+++ b/configure.in
@@ -438,6 +438,14 @@ dnl *****
 
 AM_PATH_GCONF(0.5.0,,,gconf-gtk)
 
+saved_CFLAGS="$CFLAGS"
+saved_LDFLAGS="$LDFLAGS"
+CFLAGS="$CFLAGS $GCONF_CFLAGS"
+LDFLAGS="$LDFLAGS $GCONF_LIBS"
+AC_CHECK_FUNCS(gconf_client_get_default)
+CFLAGS="$saved_CFLAGS"
+LDFLAGS="$saved_LDFLAGS"
+
 dnl ********
 dnl Kerberos
 dnl ********