diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index e7e8065118b65e651ff001ded763ff23670e6fc2..d760b2f0d9847efb1bd4ac0d92f6e7243b052f58 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,19 +1,8 @@
-2005-11-28  Jakub Jelinek  <jakub@redhat.com>
-
-	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.
+2005-11-28  Steven G. Kargl  <kargls@comcast.net>
 
-	* intrinsics/ftell.c (ftell, FTELL_SUB): Add unlock_unit call.
-	* intrinsics/fget.c (fgetc, fputs): Likewise.
-	* intrinsics/tty.c (ttynam): Likewise.
+	PR libgfortran/25149
+	* intrinsics/abort.c: Add external abort_ to allow linking when 
+	invoking -std=f95 in testsuite.
 
 2005-11-27  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
diff --git a/libgfortran/intrinsics/abort.c b/libgfortran/intrinsics/abort.c
index 65c00266e459df9a5587a000f8060355b48915bc..50876cb1f94a894cdd1c66ddc7538e7bf6c388e8 100644
--- a/libgfortran/intrinsics/abort.c
+++ b/libgfortran/intrinsics/abort.c
@@ -38,3 +38,15 @@ void PREFIX(abort) (void)
   close_units ();
   abort ();
 }
+
+/* abort() is needed for the testsuite when linking with -std=f95.  */
+
+extern void abort_ (void);
+export_proto_np(abort_);
+
+void
+abort_ (void)
+{
+  close_units ();
+  abort ();
+}