diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 5b8942776cb..2e9914e40ce 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -85,6 +85,23 @@
 	* intrinsics/abort.c: Add external abort_ to allow linking when 
 	invoking -std=f95 in testsuite.
 
+2005-11-28  Jakub Jelinek  <jakub@redhat.com>
+
+	PR libfortran/24991
+	* acinclude.m4 (LIBGFOR_CHECK_PRAGMA_WEAK): Rename to...
+	(LIBGFOR_GTHREAD_WEAK): ... this.  Define SUPPORTS_WEAK rather
+	than HAVE_PRAGMA_WEAK.  Define GTHREAD_USE_WEAK to 0 on hosts
+	that shouldn't use weak in gthr.h.
+	* configure.ac: Use LIBGFOR_GTHREAD_WEAK instead of
+	LIBGFOR_CHECK_PRAGMA_WEAK.
+	* config.h.in: Regenerated.
+	* configure: Regenerated.
+	* io/io.h (SUPPORTS_WEAK): Don't define here.
+
+	* intrinsics/ftell.c (ftell, FTELL_SUB): Add unlock_unit call.
+	* intrinsics/fget.c (fgetc, fputs): Likewise.
+	* intrinsics/tty.c (ttynam): Likewise.
+
 2005-11-27  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR libgfortran/25109