diff --git a/ChangeLog b/ChangeLog
index a2c7d805c7..3d49835dd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-04-15  Federico Mena Quintero  <federico@ximian.com>
 
+	* gtk/gtkfilesel.c (open_new_dir): Tell the user to use
+	G_FILENAME_ENCODING, not G_BROKEN_FILENAMES.  Fixes #114065.
+
 	* gtk/gtkfilechooserdefault.c (split_uris): Use a variant of the
 	code from gtkfilesel.c to parse a "text/uri-list" blob.  Fixes
 	#140126.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a2c7d805c7..3d49835dd4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-04-15  Federico Mena Quintero  <federico@ximian.com>
 
+	* gtk/gtkfilesel.c (open_new_dir): Tell the user to use
+	G_FILENAME_ENCODING, not G_BROKEN_FILENAMES.  Fixes #114065.
+
 	* gtk/gtkfilechooserdefault.c (split_uris): Use a variant of the
 	code from gtkfilesel.c to parse a "text/uri-list" blob.  Fixes
 	#140126.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a2c7d805c7..3d49835dd4 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,8 @@
 2004-04-15  Federico Mena Quintero  <federico@ximian.com>
 
+	* gtk/gtkfilesel.c (open_new_dir): Tell the user to use
+	G_FILENAME_ENCODING, not G_BROKEN_FILENAMES.  Fixes #114065.
+
 	* gtk/gtkfilechooserdefault.c (split_uris): Use a variant of the
 	code from gtkfilesel.c to parse a "text/uri-list" blob.  Fixes
 	#140126.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a2c7d805c7..3d49835dd4 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-04-15  Federico Mena Quintero  <federico@ximian.com>
 
+	* gtk/gtkfilesel.c (open_new_dir): Tell the user to use
+	G_FILENAME_ENCODING, not G_BROKEN_FILENAMES.  Fixes #114065.
+
 	* gtk/gtkfilechooserdefault.c (split_uris): Use a variant of the
 	code from gtkfilesel.c to parse a "text/uri-list" blob.  Fixes
 	#140126.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a2c7d805c7..3d49835dd4 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-04-15  Federico Mena Quintero  <federico@ximian.com>
 
+	* gtk/gtkfilesel.c (open_new_dir): Tell the user to use
+	G_FILENAME_ENCODING, not G_BROKEN_FILENAMES.  Fixes #114065.
+
 	* gtk/gtkfilechooserdefault.c (split_uris): Use a variant of the
 	code from gtkfilesel.c to parse a "text/uri-list" blob.  Fixes
 	#140126.
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 86bdf3fecc..9e1bf6b1cd 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -3136,8 +3136,8 @@ open_new_dir (gchar       *dir_name,
 	  || !g_utf8_validate (sent->entries[n_entries].entry_name, -1, NULL))
 	{
 	  gchar *escaped_str = g_strescape (dirent, NULL);
-	  g_message (_("The filename \"%s\" couldn't be converted to UTF-8 "
-		       "(try setting the environment variable G_BROKEN_FILENAMES): %s"),
+	  g_message (_("The filename \"%s\" couldn't be converted to UTF-8. "
+		       "(try setting the environment variable G_FILENAME_ENCODING): %s"),
 		     escaped_str,
 		     error->message ? error->message : _("Invalid UTF-8"));
 	  g_free (escaped_str);