diff --git a/ChangeLog b/ChangeLog
index af8f940d8..894254524 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-04 18:43  Alexander Malmberg <alexander@malmberg.org>
+
+	* Headers/AppKit/NSWindow.h, Source/NSWindow.m: Change the return
+	type of	-initWithWindowRef: to id.
+
 2003-09-02  Adam Fedor  <fedor@gnu.org>
 
 	* Tools/gsnd/gsnd.m (main): Don't mess with file descriptors on MinGW.
diff --git a/Headers/AppKit/NSWindow.h b/Headers/AppKit/NSWindow.h
index d679ed9ff..7d4a30aa4 100644
--- a/Headers/AppKit/NSWindow.h
+++ b/Headers/AppKit/NSWindow.h
@@ -518,7 +518,7 @@ APPKIT_EXPORT NSSize NSTokenSize;
 - (NSToolbar *) toolbar;
 - (void) toggleToolbarShown: (id)sender;
 - (void) runToolbarCustomizationPalette: (id)sender;
-- (NSWindow *) initWithWindowRef: (void *)windowRef;
+- (id) initWithWindowRef: (void *)windowRef;
 - (void *)windowRef;
 - (void*) windowHandle;
 #endif
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 5f61c891d..92119e058 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -4032,7 +4032,7 @@ Code shared with [NSPanel -sendEvent:], remember to update both places.
   [_toolbar runCustomizationPalette: sender];
 }
 
-- (NSWindow *) initWithWindowRef: (void *)windowRef
+- (id) initWithWindowRef: (void *)windowRef
 {
   // TODO
   NSLog(@"Method %s is not implemented for class %s",