diff --git a/ChangeLog b/ChangeLog
index 3a16d19f6e..3d697972ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-11-02  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
+	* src/support/filetools.C (SpaceLess): new version of the
+	SpaceLess functions. What problems does this one give? Please
+	report.
+
 	* images/banner_bw.xbm: made the arrays unsigned char *
 
 1999-11-02  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 7adbc5328f..f3443ab3e5 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -561,7 +561,7 @@ int MakeDVIOutput(Buffer *buffer)
 /* wait == true means wait for termination       */
 // The bool should be placed last on the argument line. (Lgb)
 // Returns false if we fail.
-bool RunScript(Buffer *buffer, bool wait,
+bool RunScript(Buffer * buffer, bool wait,
 	       string const & command, string const & orgname = string(),
 	       bool need_shell=true)
 {
@@ -828,7 +828,7 @@ bool MenuPreview(Buffer *buffer)
 }
 
 
-void MenuMakeLaTeX(Buffer *buffer)
+void MenuMakeLaTeX(Buffer * buffer)
 {
 	if (buffer->text) {
 		// Get LaTeX-Filename
diff --git a/src/support/filetools.C b/src/support/filetools.C
index f54f05d4b1..0ffc353683 100644
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -74,14 +74,15 @@ string SpaceLess(string const & file)
 	
 	for (string::size_type i = 0; i < name.length(); ++i) {
 		name[i] &= 0x7f; // set 8th bit to 0
-		if (!isalnum(name[i]) && name[i] != '.')
-			name[i] = '_';
+		if (!isgraph(name[i])) name[i] = '_'; // get rid of cntrl chars
+	};
+	// ok so we scan through the string twice, but who cares.
+	string change("/");
+	string::size_type pos = 0;
+	while ((pos = name.find_first_of(change, pos)) != string::npos) {
+		name[pos] = '-';
 	}
 	string temp = AddName(path, name);
-	// Replace spaces with underscores, also in directory
-	// No!!! I checked it that it is not necessary.
-	// temp = subst(temp, ' ', '_');
-
 	return temp;
 }