diff --git a/lib/ChangeLog b/lib/ChangeLog
index 6babc9bd6d..914563b2bd 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,6 @@
+2006-07-04  Enrico Forestieri <forenr@tlc.unipr.it>
+	* configure.py: fix checkTeXAllowSpaces
+
 2006-07-03  Jean-Marc Lasgouttes <lasgouttes@lyx.org> and Enrico Forestieri <forenr@tlc.unipr.it>
 	* configure.py: use \nonstopmode instead of -interaction=nonstopmode
 
diff --git a/lib/configure.py b/lib/configure.py
index 72ac4fbc83..7ed9794001 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -636,8 +636,12 @@ def checkTeXAllowSpaces():
   tex_allows_spaces = 'false'
   if lyx_check_config:
     print "Checking whether TeX allows spaces in file names... ",
-    writeToFile('a b.tex', r'\nonstopmode\message{working^^J}' )
-    if ''.join(cmdOutput(LATEX + ' "a b"')).find('working') != -1:
+    writeToFile('a b.tex', r'\message{working^^J}' )
+    if os.name == 'nt':
+      latex_out = cmdOutput(LATEX + r""" "\nonstopmode\input{\"a b\"}" """)
+    else:
+      latex_out = cmdOutput(LATEX + r""" '\nonstopmode\input{"a b"}' """)
+    if 'working' in latex_out:
       print 'yes'
       tex_allows_spaces = 'true'
     else: