diff --git a/ChangeLog b/ChangeLog
index 3cc7f8c7a..e02eabafc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-17  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSUndoManager.m: Don't post checkpoint notification when
+	beginning top level group.  Fix for #25607
+
 2009-02-16  Adam Fedor  <fedor@gnu.org>
 
 	* configure.ac: Look in LOCAL for headers/libs
diff --git a/Source/NSUndoManager.m b/Source/NSUndoManager.m
index c7fa7bc5b..08b632164 100644
--- a/Source/NSUndoManager.m
+++ b/Source/NSUndoManager.m
@@ -189,14 +189,15 @@
  * Starts a new grouping of undo actions which can be
  * atomically undone by an [-undo] invocation.
  * This method posts an NSUndoManagerCheckpointNotification
- * unless an undo is currently in progress.  It posts an
+ * unless an undo is currently in progress or this is begiinng a
+ * top level group.  It posts an
  * NSUndoManagerDidOpenUndoGroupNotification upon creating the grouping.
  */
 - (void) beginUndoGrouping
 {
   PrivateUndoGroup	*parent;
 
-  if (_isUndoing == NO)
+  if (_isUndoing == NO && _group != nil)
     {
       [[NSNotificationCenter defaultCenter]
 	  postNotificationName: NSUndoManagerCheckpointNotification