diff --git a/ChangeLog b/ChangeLog
index a6954f3d21..e691b99949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-28  David Hampton  <hampton@employees.org>
+
+	* configure.in: Set the GNOME_DISABLE_DEPRECATED flag for gnome
+	versions up to 2.13.7.
+
+	* src/gnome-utils/dialog-options.c: Allow this one file to use
+	deprecated gnome functions, but only when compiled with gtk 2.4.
+	Later versions of gtk include the needed replacement function and
+	deprecated gnome functions are not allowed.
+
 2006-02-27  David Hampton  <hampton@employees.org>
 
 	* src/gnome-utils/dialog-utils.[ch]: Remove a unused function that
diff --git a/configure.in b/configure.in
index b6f9b3b31c..e9a506b312 100644
--- a/configure.in
+++ b/configure.in
@@ -1006,7 +1006,15 @@ then
     AS_SCRUB_INCLUDE(GNOME_CFLAGS)
     AC_SUBST(GNOME_CFLAGS)
     AC_SUBST(GNOME_LIBS)
-    HAVE_UNTESTED_GNOME=yes
+
+    AC_MSG_CHECKING([for untested GNOME versions (libgnome > 2.13.7)])
+    if $PKG_CONFIG 'libgnome-2.0 > 2.13.7'
+    then
+      AC_MSG_RESULT(yes)
+      HAVE_UNTESTED_GNOME=yes
+    else
+      AC_MSG_RESULT(no)
+    fi
 
     PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
     AS_SCRUB_INCLUDE(GDK_PIXBUF_CFLAGS)
diff --git a/src/gnome-utils/dialog-options.c b/src/gnome-utils/dialog-options.c
index c1b656467b..380fae6718 100644
--- a/src/gnome-utils/dialog-options.c
+++ b/src/gnome-utils/dialog-options.c
@@ -26,6 +26,7 @@
 #ifdef HAVE_GTK26 
 #include <gtk/gtk.h>
 #else
+#undef GNOME_DISABLE_DEPRECATED
 #include <gnome.h>
 #endif
 #include <gdk/gdk.h>