diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 83b4d760b423..07b8fbe30c2d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-27  Janne Blomqvist  <jb@gcc.gnu.org>
+
+	* gfortran.dg/hollerith_f95.f90: Add -fall-intrinsics.
+	* gfortran.dg/byte_1.f90: Likewise.
+	* gfortran.dg/dup_save_2.f90: Likewise.
+
 2006-05-27  Paul Thomas  <pault@gcc.gnu.org>
 
 	* gfortran.dg/associated_2.f90: New test.
diff --git a/gcc/testsuite/gfortran.dg/byte_1.f90 b/gcc/testsuite/gfortran.dg/byte_1.f90
index a9e239e78da4..6cac4216f85d 100644
--- a/gcc/testsuite/gfortran.dg/byte_1.f90
+++ b/gcc/testsuite/gfortran.dg/byte_1.f90
@@ -1,5 +1,5 @@
 ! { dg-do compile }
-! { dg-options "-std=f95" }
+! { dg-options "-fall-intrinsics -std=f95" }
 program testbyte
   integer(1) :: ii = 7
   call foo(ii)
diff --git a/gcc/testsuite/gfortran.dg/dup_save_2.f90 b/gcc/testsuite/gfortran.dg/dup_save_2.f90
index 3a24bdc9c5ee..a0d340ad6e8f 100644
--- a/gcc/testsuite/gfortran.dg/dup_save_2.f90
+++ b/gcc/testsuite/gfortran.dg/dup_save_2.f90
@@ -1,5 +1,5 @@
 ! { dg-do compile }
-! { dg-options "-std=f95" }
+! { dg-options "-fall-intrinsics -std=f95" }
 program save_2
   implicit none
   integer i
diff --git a/gcc/testsuite/gfortran.dg/hollerith_f95.f90 b/gcc/testsuite/gfortran.dg/hollerith_f95.f90
index fc70c51ae9b0..1ba74036c26d 100644
--- a/gcc/testsuite/gfortran.dg/hollerith_f95.f90
+++ b/gcc/testsuite/gfortran.dg/hollerith_f95.f90
@@ -1,5 +1,5 @@
 ! { dg-do compile }
-! { dg-options "-std=f95" }
+! { dg-options "-fall-intrinsics -std=f95" }
 ! PR15966, PR18781 & PR16531
 implicit none
 complex(kind=8) x(2) 
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index dab931eec793..ff19d5e694d4 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-27  Janne Blomqvist  <jb@gcc.gnu.org>
+
+	* intrinsics/abort.c (abort_): Remove.
+
 2006-05-26  Janne Blomqvist  <jb@gcc.gnu.org>
 
 	* configure.ac: Remove AC_FUNC_MMAP.
diff --git a/libgfortran/intrinsics/abort.c b/libgfortran/intrinsics/abort.c
index 50876cb1f94a..6bf313ad364a 100644
--- a/libgfortran/intrinsics/abort.c
+++ b/libgfortran/intrinsics/abort.c
@@ -1,5 +1,5 @@
 /* Implementation of the ABORT intrinsic.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
 
@@ -38,15 +38,3 @@ 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 ();
-}