diff --git a/ChangeLog b/ChangeLog
index 1be9c05..df59fef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-06 Riccardo Mottola <rmottola@users.sf.net>
+
+	* Modules\Editors\ProjectCenter\PCEditor.m: setup undo on the editor
+	view
+
 2009-11-26 Richard frith-Macdonald <rfm@gnu.org>
 
 	* Modules/Projects/Application/Resources/AppController.m:
@@ -16,7 +21,7 @@
 
 2009-09-19 Riccardo Mottola <rmottola@users.sf.net>
 
-	* Images/Options.tiff
+	* Images/Options.tiff:
 	Added new icon, drawn by me.
 	
 2009-09-18 Riccardo Mottola <rmottola@users.sf.net>
diff --git a/Modules/Editors/ProjectCenter/PCEditor.m b/Modules/Editors/ProjectCenter/PCEditor.m
index f604610..f61ecbf 100644
--- a/Modules/Editors/ProjectCenter/PCEditor.m
+++ b/Modules/Editors/ProjectCenter/PCEditor.m
@@ -1,10 +1,11 @@
 /*
    GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
 
-   Copyright (C) 2002-2004 Free Software Foundation
+   Copyright (C) 2002-2010 Free Software Foundation
 
    Authors: Philippe C.D. Robert
             Serg Stoyan
+	    Riccardo Mottola
 
    This file is part of GNUstep.
 
@@ -145,6 +146,10 @@
   [[ev textContainer] setContainerSize:NSMakeSize(fr.size.width, 1e7)];
 
   [ev setEditable:_isEditable];
+
+  // Activate undo
+  [ev setAllowsUndo: YES];
+
   [[NSNotificationCenter defaultCenter]
     addObserver:self 
        selector:@selector(textDidChange:)
@@ -801,6 +806,11 @@
   if ([object isKindOfClass:[PCEditorView class]]
       && (object == _intEditorView || object == _extEditorView))
     {
+      if (![self hasUndoManager])
+        {
+          [self updateChangeCount: NSChangeDone];
+      }
+
       if (_isEdited == NO)
 	{
 	  [[NSNotificationCenter defaultCenter]