diff --git a/ChangeLog b/ChangeLog
index a60d5f7170..cb3eba2c36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesel.c (cmpl_init_state): Prevent an infinite
+	loop when G_FILENAME_ENCODING is invalid.  (#309280, Padraig Brady)
+
 Thu Jun 30 14:17:24 2005  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a60d5f7170..cb3eba2c36 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-07-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesel.c (cmpl_init_state): Prevent an infinite
+	loop when G_FILENAME_ENCODING is invalid.  (#309280, Padraig Brady)
+
 Thu Jun 30 14:17:24 2005  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a60d5f7170..cb3eba2c36 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-07-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesel.c (cmpl_init_state): Prevent an infinite
+	loop when G_FILENAME_ENCODING is invalid.  (#309280, Padraig Brady)
+
 Thu Jun 30 14:17:24 2005  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event.
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index fd13b1f57c..f82e81f914 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -2671,13 +2671,14 @@ cmpl_init_state (void)
 {
   gchar *utf8_cwd;
   CompletionState *new_state;
+  gint tries = 0;
 
   new_state = g_new (CompletionState, 1);
 
   utf8_cwd = get_current_dir_utf8 ();
 
 tryagain:
-
+  tries++;
   new_state->reference_dir = NULL;
   new_state->completion_dir = NULL;
   new_state->active_completion_dir = NULL;
@@ -2697,7 +2698,8 @@ tryagain:
     {
       /* Directories changing from underneath us, grumble */
       strcpy (utf8_cwd, G_DIR_SEPARATOR_S);
-      goto tryagain;
+      if (tries < 2)
+	goto tryagain;
     }
 
   g_free (utf8_cwd);