diff --git a/ChangeLog b/ChangeLog
index 429f0fb60..68f7c783f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-23  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSAlert.m (NSRunAlertPanel): Fix incorrect return code
+	when called in a non-gui application.
+
 2010-04-20 Doug Simons <doug.simons@testplant.com>
 
 	* Headers/Additions/GNUstepGUI/GSWindowDecorationView.h:
diff --git a/Source/NSAlert.m b/Source/NSAlert.m
index c13658da9..2cbc555a8 100644
--- a/Source/NSAlert.m
+++ b/Source/NSAlert.m
@@ -1384,7 +1384,7 @@ NSRunAlertPanel(
     {
       // No NSApp ... not running in a gui application so just log.
       NSLog(@"%@", message);
-      return NSAlertFirstButtonReturn;
+      return NSAlertDefaultReturn;
     }
   if (defaultButton == nil)
     {