diff --git a/src/configure.in b/src/configure.in
index 84303c88da81442fdd08b6f4e9a7f6015767dc3f..780e3009f588fb5a548e3d437f3b130eb486569a 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.785 2004/02/27 16:01:11 grubba Exp $")
+AC_REVISION("$Id: configure.in,v 1.786 2004/02/28 20:11:17 grubba Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -6932,7 +6932,24 @@ $bundle_info])
 	    # subshell unsetting it shouldn't be a problem.
 	    unset INSTALL
 
-	    ${CONFIG_SHELL-/bin/sh} "$bundle_source_dir/configure" --prefix="$pike_bundle_prefix" \
+	    extra_configure_args=""
+	    # Some libraries insist in using config.guess;
+	    # they tend to have problems with rntcl...
+	    # Let's help them along.
+	    if echo foo "$CC" | egrep 'rntc.|rnt.cl' >/dev/null; then
+	      cpu="`uname -m`"
+	      if test "$cpu" = "x86"; then
+	        # Normalize the cpu.
+	        cpu="i386"
+	      fi
+	      extra_configure_args="--build=${cpu}-unknown-winnt`uname -r`"
+	    fi
+
+	    echo "${CONFIG_SHELL-/bin/sh} \"$bundle_source_dir/configure\"" \
+	      "--prefix=\"$pike_bundle_prefix\"" ${extra_configure_args} \
+	      "--disable-shared --cache-file=config.cache"
+	    ${CONFIG_SHELL-/bin/sh} "$bundle_source_dir/configure" \
+	      --prefix="$pike_bundle_prefix" ${extra_configure_args} \
 	      --disable-shared --cache-file=config.cache || exit 1
 	    if test -f "Makefile"; then :; else
 	      echo "Makefile not found in `pwd`."