diff --git a/ChangeLog b/ChangeLog
index 9cc8d3da8..358c2cc1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-21  Matthias Clasen  <matthiasc@poet.de>
+
+	* glib/gfileutils.c (g_file_get_contents): Remove FIXME. (#67063)
+
 2001-12-19  Mark McLoughlin  <mark@skynet.ie>
 
 	* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9cc8d3da8..358c2cc1a 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2001-12-21  Matthias Clasen  <matthiasc@poet.de>
+
+	* glib/gfileutils.c (g_file_get_contents): Remove FIXME. (#67063)
+
 2001-12-19  Mark McLoughlin  <mark@skynet.ie>
 
 	* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9cc8d3da8..358c2cc1a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2001-12-21  Matthias Clasen  <matthiasc@poet.de>
+
+	* glib/gfileutils.c (g_file_get_contents): Remove FIXME. (#67063)
+
 2001-12-19  Mark McLoughlin  <mark@skynet.ie>
 
 	* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 9cc8d3da8..358c2cc1a 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2001-12-21  Matthias Clasen  <matthiasc@poet.de>
+
+	* glib/gfileutils.c (g_file_get_contents): Remove FIXME. (#67063)
+
 2001-12-19  Mark McLoughlin  <mark@skynet.ie>
 
 	* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9cc8d3da8..358c2cc1a 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2001-12-21  Matthias Clasen  <matthiasc@poet.de>
+
+	* glib/gfileutils.c (g_file_get_contents): Remove FIXME. (#67063)
+
 2001-12-19  Mark McLoughlin  <mark@skynet.ie>
 
 	* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9cc8d3da8..358c2cc1a 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2001-12-21  Matthias Clasen  <matthiasc@poet.de>
+
+	* glib/gfileutils.c (g_file_get_contents): Remove FIXME. (#67063)
+
 2001-12-19  Mark McLoughlin  <mark@skynet.ie>
 
 	* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9cc8d3da8..358c2cc1a 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2001-12-21  Matthias Clasen  <matthiasc@poet.de>
+
+	* glib/gfileutils.c (g_file_get_contents): Remove FIXME. (#67063)
+
 2001-12-19  Mark McLoughlin  <mark@skynet.ie>
 
 	* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9cc8d3da8..358c2cc1a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2001-12-21  Matthias Clasen  <matthiasc@poet.de>
+
+	* glib/gfileutils.c (g_file_get_contents): Remove FIXME. (#67063)
+
 2001-12-19  Mark McLoughlin  <mark@skynet.ie>
 
 	* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index f4c0858c4..38298dbe6 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-21  Matthias Clasen  <matthias@poet.de>
+
+	* glib/glib-sections.txt: Move g_get_charset() to the
+	Charset conversion section. (#65630)
+ 
 Wed Dec 19 23:07:53 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/tmpl/messages.sgml glib/tmpl/string_utils.sgml: 
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 7b6046093..414981d2e 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -1837,6 +1837,10 @@ g_filename_from_uri
 g_filename_to_uri
 g_locale_from_utf8
 GConvertError
+
+<SUBSECTION>
+g_get_charset
+
 <SUBSECTION Private>
 g_convert_error_quark
 </SECTION>
@@ -1847,9 +1851,6 @@ g_convert_error_quark
 gunichar
 gunichar2
 
-<SUBSECTION>
-g_get_charset
-
 <SUBSECTION>
 g_unichar_validate
 g_unichar_isalnum
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index cb287bec8..c14cea1c6 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -539,9 +539,6 @@ get_contents_win32 (const gchar *filename,
  * @length argument.  The error domain is #G_FILE_ERROR. Possible
  * error codes are those in the #GFileError enumeration.
  *
- * FIXME currently crashes if the file is too big to fit in memory;
- * should probably use g_try_malloc() when we have that function.
- * 
  * Return value: %TRUE on success, %FALSE if error is set
  **/
 gboolean