diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 55bbfa207bc..27bb48378ef 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-31  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+	PR libfortran/21787
+	* intrinsics/abort.c (abort): Close units before aborting.
+	Updated copyright years.
+
 2005-07-30  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
 	PR libfortran/22436
diff --git a/libgfortran/intrinsics/abort.c b/libgfortran/intrinsics/abort.c
index 83b42125e58..bbf7e5f3a79 100644
--- a/libgfortran/intrinsics/abort.c
+++ b/libgfortran/intrinsics/abort.c
@@ -1,5 +1,5 @@
 /* Implementation of the ABORT intrinsic.
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
 
@@ -35,5 +35,6 @@ export_proto_np(PREFIX(abort));
 
 void PREFIX(abort) (void)
 {
+  close_units ();
   abort ();
 }