diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog
index 4d3f03544f..2898830900 100644
--- a/src/tex2lyx/ChangeLog
+++ b/src/tex2lyx/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-26  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+	* text.C (parse_text): handle vspaces like '1cm' correctly
+
 2004-02-01  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
 	* text.C (parse_box): "\\" -> '\\' in calls to contains.
diff --git a/src/tex2lyx/text.C b/src/tex2lyx/text.C
index 64c3dda4e4..5280682583 100644
--- a/src/tex2lyx/text.C
+++ b/src/tex2lyx/text.C
@@ -1403,7 +1403,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 						unit = "vfill";
 						known_vspace = true;
 					}
-				} else {
+				}
+				if (!known_vspace) {
 					switch (unitFromString(unit)) {
 					case LyXLength::SP:
 					case LyXLength::PT: