--- a/Makefile	Sun Jun 02 10:31:04 2013 -0400
+++ b/Makefile	Sun Jun 02 12:40:32 2013 -0400
@@ -29,6 +29,7 @@
 else
   TARGET := i686-pc-mingw32
 endif
+BUILD_SYSTEM := $(shell tools/config.guess)
 
 # Enable shared or static libs, or perhaps both.  At least one 
 # package uses --with instead of --enable.  Probably it doesn't
@@ -41,6 +42,11 @@
 
 ## end of configuration variables.
 
+ifneq ($(MXE_NATIVE_BUILD),yes)
+  HOST_AND_BUILD_CONFIGURE_OPTIONS := \
+    --host='$(TARGET)' --build='$(BUILD_SYSTEM)'
+endif
+
 # These can't be chosen arbitrarily.  The way things are configured now,
 # GCC expects to find cross-compiler include files in $(PREFIX)/$(TARGET).
 # and it's not clear to me how to change that.