diff --git a/build/unix/wingcc_ld.sh b/build/unix/wingcc_ld.sh
index a05664348fe2fb4f9b5b35c8981e4f16cd874fd3..5b9623072121cc1936244badde7fa99e171c5c93 100755
--- a/build/unix/wingcc_ld.sh
+++ b/build/unix/wingcc_ld.sh
@@ -16,7 +16,6 @@ while [ "$1" != "" ]; do
        else
 	   args="$args $1" 
        fi ;;
-   -pthread) ;;
    *) args="$args $1" ;;
    esac
    shift
diff --git a/configure b/configure
index dfd830f7f6387d194a2f3bb071f02fec0f1d0bc3..920567fb9a29aa305f43c89b057b702f26fbefe9 100755
--- a/configure
+++ b/configure
@@ -871,9 +871,9 @@ if test ! "$platform" = "win32"; then
 	/usr/local/lib /usr/local/lib/X11 /use/local/X11R6/lib \
 	/usr/X11/lib /usr/lib/X11R5
     x11libdir=$found_dir
-    
+
     if test "x$found_lib" = "x" ; then
-	echo "`basename $0`: libX11 MUST be installed"
+	echo "`basename $0`: libX11 (package x11-devel) MUST be installed"
         exit 1
     fi
 
@@ -881,11 +881,9 @@ if test ! "$platform" = "win32"; then
 	/usr/include /usr/X11R6/include /usr/include/X11 /usr/openwin/include \
 	/usr/local/include /usr/local/include/X11 /use/local/X11R6/include \
 	/usr/X11/include /usr/include/X11R5
-    x11inc=$found_hdr
-    x11incdir=$found_dir
 
-    if test "x$x11incdir" = "x" ; then
-	echo "`basename $0`: X11 headers (x11-devel) MUST be installed"
+    if test "x$found_dir" = "x" ; then
+	echo "`basename $0`: X11 headers (package x11-devel) MUST be installed"
         exit 1
     fi
 
@@ -934,6 +932,12 @@ linux|fbsd)
     fi
     ;;
 esac
+case $arch in
+win32gcc)
+    enable_thread="yes"
+    threadlib=
+    ;;
+esac
 if test "x$enable_thread" = "xyes" && \
    test ! "$platform" = "win32"    && \
    test "x$threadlib" = "x" ; then