diff --git a/ChangeLog b/ChangeLog
index 6809e9829..a4e5447f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-13  Jonathan Gillaspie <jonathan.gillaspie@testplant.com>
+
+    * Source/NSWindow.m: Add back showsResizeIndicator that got dropped during a merge.
+
 2012-10-24  Doug Simons <doug.simons@testplant.com>
 
     * Source/GSDragView.m: Revert my previous change, which failed to set the
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 2691b0ead..9c498ecd6 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -2011,10 +2011,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
 
 - (BOOL) showsResizeIndicator
 {
-  // TODO
-  NSLog(@"Method %s is not implemented for class %s",
-        "showsResizeIndicator", "NSWindow");
-  return YES;
+  return ([self styleMask] & NSResizableWindowMask) ? YES : NO;
 }
 
 - (void) setShowsResizeIndicator: (BOOL)show