diff --git a/ChangeLog b/ChangeLog
index c2be3231f..3a3581b5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-25  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Headers/Foundation/NSErrorRecoveryAttempting.h: Add new file.
+	* Source/GNUmakefile: Install this file.
+
 2007-07-22  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Tools/AGSOutput.m: escape angle brackets in types of function
diff --git a/Headers/Foundation/NSErrorRecoveryAttempting.h b/Headers/Foundation/NSErrorRecoveryAttempting.h
new file mode 100644
index 000000000..2b851c23c
--- /dev/null
+++ b/Headers/Foundation/NSErrorRecoveryAttempting.h
@@ -0,0 +1,59 @@
+/** Interface for NSErrorRecoveryAttempting for GNUStep
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   Written by:  Fred Kiefer <fredkiefer@gmx.de>
+   Date: July 2007
+   
+   This file is part of the GNUstep Base Library.
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
+
+   */ 
+
+#ifndef __NSErrorRecoveryAttempting_h_GNUSTEP_BASE_INCLUDE
+#define __NSErrorRecoveryAttempting_h_GNUSTEP_BASE_INCLUDE
+#import	<GNUstepBase/GSVersionMacros.h>
+
+#if	OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
+
+#import	<Foundation/NSObject.h>
+
+#if	defined(__cplusplus)
+extern "C" {
+#endif
+
+/**
+ * These methods define the informal error recovery protocol
+ */
+@interface NSObject (NSErrorRecoveryAttempting)
+
+- (BOOL) attemptRecoveryFromError: (NSError*)error
+                      optionIndex: (unsigned int)recoveryOptionIndex;
+- (void) attemptRecoveryFromError: (NSError*)error
+                      optionIndex: (unsigned int)recoveryOptionIndex
+                         delegate: (id)delegate
+               didRecoverSelector: (SEL)didRecoverSelector
+                      contextInfo: (void*)contextInfo;
+
+@end
+
+#if	defined(__cplusplus)
+}
+#endif
+
+#endif
+
+#endif	/* __NSErrorRecoveryAttempting_h_GNUSTEP_BASE_INCLUDE*/
diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index 7b08148a4..f93d2c8a9 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -320,6 +320,7 @@ NSDistributedLock.h \
 NSDistributedNotificationCenter.h \
 NSEnumerator.h \
 NSError.h \
+NSErrorRecoveryAttempting.h \
 NSException.h \
 NSExpression.h \
 NSFileHandle.h \