diff --git a/ChangeLog b/ChangeLog
index 47b99e289..21be27e97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-28 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSTextView.m (-buildUpTextNetwork:): Move setting the
+	default line framgent padding from here ...
+	* Source/NSTextContainer.m (-initWithContainerSize:): ... to here.
+
 2011-11-28 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSOpenGLView.m (-_frameChanged:): Don't send -reshape
diff --git a/Source/NSTextContainer.m b/Source/NSTextContainer.m
index 46c7e048b..03de861ac 100644
--- a/Source/NSTextContainer.m
+++ b/Source/NSTextContainer.m
@@ -107,7 +107,8 @@ use bounds rectangle instead of frame? */
   _layoutManager = nil;
   _textView = nil;
   _containerRect.size = aSize;
-  _lineFragmentPadding = 0.0; 
+  // Tests on Cocoa indicate the default value is 5.
+  _lineFragmentPadding = 5.0; 
   _observingFrameChanges = NO;
   _widthTracksTextView = NO;
   _heightTracksTextView = NO;
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index 08a5c8d38..3b666c577 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -697,7 +697,6 @@ If a text view is added to an empty text network, it keeps its attributes.
   RELEASE(layoutManager);
 
   textContainer = [[NSTextContainer alloc] initWithContainerSize: aSize];
-  [textContainer setLineFragmentPadding: 5.0]; // Tests on Cocoa indicate the default value is 5.
   [layoutManager addTextContainer: textContainer];
   RELEASE(textContainer);