diff --git a/lib/ChangeLog b/lib/ChangeLog
index 99a1b1ed23..918ba96852 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-14  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* configure.m4: remove texput.log after testing for spaces.
+
+2005-06-14  Enrico Forestieri  <forenr@tlc.unipr.it>
+
+	* configure.m4: avoid using symbolic links since they confuse
+	miktex. 
+
 2005-06-09  Michael Schmitt  <michael.schmitt@teststep.org>
 
 	* layouts/*: put all LabelStrings in quotes
diff --git a/lib/configure.m4 b/lib/configure.m4
index 86a71b6e10..5168a4da12 100644
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -471,8 +471,8 @@ else
   MSG_RESULT(auto)
   rm -f wrap_chkconfig.ltx chkconfig.vars chkconfig.classes chklayouts.tex
   if test ! -r "chkconfig.ltx" ; then
-    ln -s "${srcdir}"/chkconfig.ltx .
-    rmlink=true
+    cp "${srcdir}"/chkconfig.ltx .
+    rmcopy=true
   fi
   cat >wrap_chkconfig.ltx <<EOF
 ${linuxdoc_cmd}
@@ -511,7 +511,7 @@ q
 changequote([,])dnl
   [eval] `cat chkconfig.vars | sed 's/-/_/g'`
 changequote(,)dnl
-  test -n "${rmlink}" && rm -f chkconfig.ltx
+  test -n "${rmcopy}" && rm -f chkconfig.ltx
 fi
 
 # Do we have all the files we need? Useful if latex did not run
@@ -556,7 +556,7 @@ else
     MSG_RESULT(no)
     tex_allows_spaces=false
   fi
-  rm -r "$fname".*
+  rm -r "$fname".* texput.log
 fi
 
 echo "creating $outfile"