diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index c6d623534..45d706561 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-04  Corinna Vinschen  <corinna@vinschen.de>
+
+	* Makefile.in: Semi-revert semi-reversion of 2006-08-30 change, now
+	correctly parenthesized.
+
 2006-09-19  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* mingwex/mb_wc_common.h (get_codepage): Get it
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index dbbfac977..f3531e168 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -54,11 +54,18 @@ inst_includedir:=$(tooldir)/include/mingw
 inst_libdir:=$(tooldir)/lib/mingw
 inst_docdir:=$(tooldir)/share/doc/mingw-runtime
 else
+ifneq (,$(with_cross_host))
+inst_bindir:=$(tooldir)/bin
+inst_includedir:=$(tooldir)/include
+inst_libdir:=$(tooldir)/lib
+inst_docdir:=$(tooldir)/share/doc/mingw-runtime
+else
 inst_bindir:=$(bindir)
 inst_includedir:=$(includedir)
 inst_libdir:=$(libdir)
 inst_docdir:=$(prefix)/doc/mingw-runtime
 endif
+endif
 
 # The Mingw headers are installed under a subdirectory of
 # $(tooldir)/include when configuring in Cygwin.