diff --git a/ChangeLog b/ChangeLog
index 127f83438..5a1d084a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-27  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSTextContainer.m (lineFragmentRectForProposedRect:...):
+	Prevent negative width/height from being returned.
+	Bug found by unit test from Nikolaus Schaller <hns@computer.org>.
+
 2013-01-25 12:58-EST Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/NSPopUpButtonCell.m: Revert previous change.
diff --git a/Source/NSTextContainer.m b/Source/NSTextContainer.m
index b21d788f2..90f16e73d 100644
--- a/Source/NSTextContainer.m
+++ b/Source/NSTextContainer.m
@@ -448,7 +448,9 @@ framework intact.
       return NSZeroRect;
     }
 
-  return NSMakeRect(minx, miny, maxx - minx, maxy - miny);
+  return NSMakeRect(minx, miny,
+                    (maxx > minx) ? maxx - minx : 0.0,
+                    (maxy > miny) ? maxy - miny : 0.0);
 }
 
 - (BOOL) isSimpleRectangularTextContainer