diff --git a/ChangeLog b/ChangeLog
index 16581373b..0d9079863 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-23 19:11  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/NSTextContainer.m (-dealloc): Set the text container of
+	our text view, if any, to nil.
+
 2003-09-22  Adam Fedor  <fedor@gnu.org>
 
 	* Source/NSWindowController.m (-setWindow:):  Set window's
diff --git a/Source/NSTextContainer.m b/Source/NSTextContainer.m
index 16ab11136..a7b6553b0 100644
--- a/Source/NSTextContainer.m
+++ b/Source/NSTextContainer.m
@@ -112,7 +112,8 @@ use bounds rectangle instead of frame? */
       [nc removeObserver: self
 	  name: NSViewFrameDidChangeNotification
 	  object: _textView];
-      
+
+      [_textView setTextContainer: nil];
       RELEASE(_textView);
     }
   [super dealloc];