diff --git a/ChangeLog b/ChangeLog
index c842441198..2c996f88f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-10-08  Jürgen Vigna <jug@sad.it>
+
+	* src/support/filetools.C (FileOpenSearch): Fixed a bug where
+	when in the PATH was something like /usr/bin;;/bin (note: the ;;)
+	it returned without continuing to search the path.
+	
 1999-10-07  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
 	* src/insets/insetquotes.C (Draw): Simplified a gread deal. This
diff --git a/src/support/filetools.C b/src/support/filetools.C
index e19db90d23..cb824cb840 100644
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -201,7 +201,9 @@ string FileOpenSearch (string const & path, string const & name,
 		real_file = FileSearch(path_element, name, ext);
 
 		if (real_file.empty()) {
-		  tmppath = split(tmppath, path_element, ';');
+		  do {
+		    tmppath = split(tmppath, path_element, ';');
+		  } while(!tmppath.empty() && path_element.empty());
 		} else {
 		  notfound = false;
 		}