diff --git a/ChangeLog b/ChangeLog
index 0369e3bd4..38a516a23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-15 18:37-EDT Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/NSScrollView.m: Fix for infinite notification loop which 
+	happens with some nib files.
+
 2009-03-15 22:09-EDT Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Source/NSScrollView.m: Use the flags in initWithCoder:
diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m
index e01a7f7c7..bc0bf9505 100644
--- a/Source/NSScrollView.m
+++ b/Source/NSScrollView.m
@@ -1525,7 +1525,12 @@ static float scrollerWidth;
       NSScroller *hScroller = [aDecoder decodeObjectForKey: @"NSHScroller"];
       NSScroller *vScroller = [aDecoder decodeObjectForKey: @"NSVScroller"];
       NSClipView *content = [aDecoder decodeObjectForKey: @"NSContentView"]; 
+      NSView *docView = [content documentView];
+      BOOL post_frame = [docView postsFrameChangedNotifications];
+      BOOL post_bound = [docView postsBoundsChangedNotifications];
 
+      [docView setPostsFrameChangedNotifications: NO];
+      [docView setPostsBoundsChangedNotifications: NO];
       _hLineScroll = 10;
       _hPageScroll = 10;
       _vLineScroll = 10;
@@ -1593,6 +1598,8 @@ static float scrollerWidth;
         }
 
       [self tile];
+      [docView setPostsFrameChangedNotifications: post_frame];
+      [docView setPostsBoundsChangedNotifications: post_bound];
     }
   else
     {