diff --git a/ChangeLog b/ChangeLog
index 46c9760da..c00a74172 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-27  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/GSHorizontalTypesetter.m (-layoutLineNewParagraph:): Only
+	adjust max_line_height to minimumLineHeight if it isn't zero.
+
 2013-10-26  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSTextView.m (-mouseDown:): Use container origin for
diff --git a/Source/GSHorizontalTypesetter.m b/Source/GSHorizontalTypesetter.m
index e3ea4ea62..f21c8422c 100644
--- a/Source/GSHorizontalTypesetter.m
+++ b/Source/GSHorizontalTypesetter.m
@@ -607,7 +607,7 @@ Return values 0, 1, 2 are mostly the same as from
     max_line_height = [curParagraphStyle maximumLineHeight];
 
     /* sanity */
-    if (max_line_height < min)
+    if (max_line_height > 0 && max_line_height < min)
       max_line_height = min;
 
     line_height = [cache->font defaultLineHeightForFont];