diff --git a/src/ChangeLog b/src/ChangeLog
index 34a8fbdbc..96bb4deff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+1999-08-31  Federico Mena Quintero  <federico@redhat.com>
+
+	* main.c: In the GNOME version, we want cd_symlinks to be FALSE.
+	The VFS should never have to look at this variable, but alas, it
+	does.  BUGFIX:  Red Hat Bugzilla #2344.
+
+	* setup.c: Disable cd_symlinks in the GNOME version.
+
 1999-08-30  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* main.c (print_mc_usage): Print the bug reporting address.
diff --git a/src/main.c b/src/main.c
index abfa827b9..33a14fcbf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -174,7 +174,11 @@ volatile int quit = 0;
 int show_all_if_ambiguous = 0;
 
 /* Set when cd symlink following is desirable (bash mode) */
+#ifndef HAVE_GNOME
 int cd_symlinks = 1;
+#else
+int cd_symlinks = 0;
+#endif
 
 /* If set then dialogs just clean the screen when refreshing, else */
 /* they do a complete refresh, refreshing all the parts of the program */
diff --git a/src/setup.c b/src/setup.c
index 72ed6d972..d10a24707 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -204,7 +204,9 @@ static struct {
     { "drop_menus", &drop_menus },
     { "wrap_mode",  &global_wrap_mode},
     { "old_esc_mode", &old_esc_mode },
+#ifndef HAVE_GNOME
     { "cd_symlinks", &cd_symlinks },
+#endif
     { "show_all_if_ambiguous", &show_all_if_ambiguous },
     { "have_fast_cpu", &have_fast_cpu },
     { "iconify_on_exec", &iconify_on_exec },