diff --git a/ChangeLog b/ChangeLog
index eaf2d2e0d..21e0ae469 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-27  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSDocument.m (-setPrintInfo:): Record old print info with
+	the document's undo manager (if there is one) as in Cocoa.
+
 2010-11-26  Gregory John Casamento  <greg.casamento@gmail.com>
 
 	* Source/GSThemeDrawing.m: Added methods to draw NSSliderCell view.
@@ -54,7 +59,7 @@
 	* Headers/Additions/GNUstepGUI/GSTheme.h: 
 	Added declaration for new method.
 	
-2010-11-26  Wolfgang Lux  <wolfgang.lux@gmail.com>>
+2010-11-26  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSWindow.m (-performClose:): Do not discard close
 	requests for a window in a modal session when the window has
diff --git a/Source/NSDocument.m b/Source/NSDocument.m
index 9f706d5ef..b00623ffa 100644
--- a/Source/NSDocument.m
+++ b/Source/NSDocument.m
@@ -1294,8 +1294,19 @@ originalContentsURL: (NSURL *)orig
 
 - (void) setPrintInfo: (NSPrintInfo *)printInfo
 {
+  NSUndoManager *undoManager = [self undoManager];
+
+  if (undoManager != nil)
+    {
+      [[undoManager prepareWithInvocationTarget: self]
+	setPrintInfo: _print_info];
+      // FIXME undoManager -setActionName:
+    }
   ASSIGN(_print_info, printInfo);
-  [self updateChangeCount: NSChangeDone];
+  if (undoManager == nil)
+    {
+      [self updateChangeCount: NSChangeDone];
+    }
 }