diff --git a/ChangeLog b/ChangeLog
index ee5fff3ab..9c2484775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-15 05:59 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/NSDocument.m: Added undo:/redo: here.  Smarter use
+	of the responder chain.
+	* Source/NSWindow.m: Removed undo:/redo: here.
+
 2005-01-14 16:11  Alexander Malmberg <alexander@malmberg.org>
 
 	* Headers/AppKit/NSSavePanel.h (-panel:shouldShowFilename:):
diff --git a/Source/NSDocument.m b/Source/NSDocument.m
index 4c075b569..5ce144c48 100644
--- a/Source/NSDocument.m
+++ b/Source/NSDocument.m
@@ -930,4 +930,14 @@
   [self updateChangeCount: NSChangeDone];
 }
 
+- (void) undo: (id)sender
+{
+  [[self undoManager] undo];
+}
+
+- (void) redo: (id)sender
+{
+  [[self undoManager] redo];
+}
+
 @end
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 9a0a615e0..01732db65 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -4155,16 +4155,6 @@ resetCursorRectsForView(NSView *theView)
   // Should only be defined on MS Windows
   return (void *)_windowNum;
 }
-
-- (void) undo: (id)sender
-{
-  [[[[NSDocumentController sharedDocumentController] currentDocument] undoManager] undo];
-}
-
-- (void) redo: (id)sender
-{
-  [[[[NSDocumentController sharedDocumentController] currentDocument] undoManager] redo];
-}
 @end
 
 /*