diff --git a/ChangeLog b/ChangeLog
index 1b8927ac0e..72a1c25a89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-14  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* src/exporter.C (Export): Give an error message when path to file 
+	contains spaces.
+
 2001-04-12  Dekel Tsur  <dekelts@tau.ac.il>
 
         * src/LaTeX.C (deplog): Always check that foundfile exists.
diff --git a/src/exporter.C b/src/exporter.C
index 26952a7b64..e5abf46023 100644
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -70,7 +70,11 @@ bool Exporter::Export(Buffer * buffer, string const & format,
 	// LaTeX backend
 	else if (backend_format == format)
 		buffer->makeLaTeXFile(filename, string(), true);
-	else
+	else if (contains(buffer->filepath, ' ')) {
+		WriteAlert(_("Cannot run latex."),
+			   _("The path to the lyx file cannot contain spaces."));
+		return false;
+	} else
 		buffer->makeLaTeXFile(filename, buffer->filepath, false);
 
 	string outfile_base = (put_in_tempdir)