diff --git a/mingw-w64-libraries/winpthreads/Makefile.in b/mingw-w64-libraries/winpthreads/Makefile.in
index eadbbd6..e14a958 100644
--- a/mingw-w64-libraries/winpthreads/Makefile.in
+++ b/mingw-w64-libraries/winpthreads/Makefile.in
@@ -90,8 +90,12 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@COPY_STATIC_TRUE@am__append_1 = libpthread.a
-@COPY_SHARED_TRUE@am__append_2 = libpthread.dll.a
+@MSVC_TRUE@am__append_1 = -nologo
+@MSVC_TRUE@am__append_2 = -D_CRT_NONSTDC_NO_WARNINGS
+@MSVC_FALSE@am__append_3 = -D__USE_MINGW_ANSI_STDIO=0
+@MSVC_FALSE@am__append_4 = -L$(builddir)/fakelib -Wc,-no-pthread
+@COPY_STATIC_TRUE@am__append_5 = libpthread.a
+@COPY_SHARED_TRUE@am__append_6 = libpthread.dll.a
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
@@ -146,9 +150,12 @@
 am__v_AR_1 = 
 fakelib_libgcc_a_AR = $(AR) $(ARFLAGS)
 fakelib_libgcc_a_LIBADD =
+am__fakelib_libgcc_a_SOURCES_DIST = src/libgcc/dll_dependency.S \
+	src/libgcc/dll_math.c
 am__dirstamp = $(am__leading_dot)dirstamp
-am_fakelib_libgcc_a_OBJECTS = src/libgcc/dll_dependency.$(OBJEXT) \
-	src/libgcc/dll_math.$(OBJEXT)
+@MSVC_FALSE@am_fakelib_libgcc_a_OBJECTS =  \
+@MSVC_FALSE@	src/libgcc/dll_dependency.$(OBJEXT) \
+@MSVC_FALSE@	src/libgcc/dll_math.$(OBJEXT)
 fakelib_libgcc_a_OBJECTS = $(am_fakelib_libgcc_a_OBJECTS)
 fakelib_libgcc_eh_a_AR = $(AR) $(ARFLAGS)
 fakelib_libgcc_eh_a_LIBADD =
@@ -243,7 +250,7 @@
 SOURCES = $(fakelib_libgcc_a_SOURCES) $(fakelib_libgcc_eh_a_SOURCES) \
 	$(fakelib_libgcc_s_a_SOURCES) $(libpthread_a_SOURCES) \
 	$(libpthread_dll_a_SOURCES) $(libwinpthread_la_SOURCES)
-DIST_SOURCES = $(fakelib_libgcc_a_SOURCES) \
+DIST_SOURCES = $(am__fakelib_libgcc_a_SOURCES_DIST) \
 	$(fakelib_libgcc_eh_a_SOURCES) $(fakelib_libgcc_s_a_SOURCES) \
 	$(libpthread_a_SOURCES) $(libpthread_dll_a_SOURCES) \
 	$(libwinpthread_la_SOURCES)
@@ -471,25 +478,27 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = . tests
-AM_CFLAGS = -Wall -DWIN32_LEAN_AND_MEAN
+AM_CFLAGS = -Wall -DWIN32_LEAN_AND_MEAN $(am__append_1)
 ACLOCAL_AMFLAGS = -I m4
 lib_LTLIBRARIES = libwinpthread.la
 include_HEADERS = include/pthread.h include/sched.h include/semaphore.h include/pthread_unistd.h include/pthread_time.h include/pthread_compat.h include/pthread_signal.h
-libwinpthread_la_CPPFLAGS = -I$(srcdir)/include -DIN_WINPTHREAD -DWINPTHREAD_DBG=1 -D__USE_MINGW_ANSI_STDIO=0
-libwinpthread_la_LDFLAGS = -no-undefined -version-info 1:0:0 -L$(builddir)/fakelib -Wc,-no-pthread
-EXTRA_libwinpthread_la_DEPENDENCIES = fakelib/libgcc.a  fakelib/libgcc_eh.a  fakelib/libgcc_s.a
+libwinpthread_la_CPPFLAGS = -I$(srcdir)/include -DIN_WINPTHREAD \
+	-DWINPTHREAD_DBG=1 $(am__append_2) $(am__append_3)
+libwinpthread_la_LDFLAGS = -no-undefined -version-info 1:0:0 \
+	$(am__append_4)
 libwinpthread_la_SOURCES = \
   src/barrier.h  src/cond.h  src/misc.h  src/mutex.h  src/rwlock.h  src/spinlock.h  src/thread.h  src/ref.h  src/sem.h  src/wpth_ver.h \
   src/barrier.c  src/cond.c  src/misc.c  src/mutex.c  src/rwlock.c  src/spinlock.c  src/thread.c  src/ref.c  src/sem.c  src/sched.c \
   src/winpthread_internal.h  src/clock.c src/nanosleep.c src/version.rc
 
+@MSVC_FALSE@EXTRA_libwinpthread_la_DEPENDENCIES = fakelib/libgcc.a  fakelib/libgcc_eh.a  fakelib/libgcc_s.a
 
 # Break circular dep on bootstrap
-noinst_LIBRARIES = fakelib/libgcc.a  fakelib/libgcc_eh.a  fakelib/libgcc_s.a
-fakelib_libgcc_a_SOURCES = src/libgcc/dll_dependency.S src/libgcc/dll_math.c
-fakelib_libgcc_s_a_SOURCES = 
-fakelib_libgcc_eh_a_SOURCES = 
-lib_LIBRARIES = $(am__append_1) $(am__append_2)
+@MSVC_FALSE@noinst_LIBRARIES = fakelib/libgcc.a  fakelib/libgcc_eh.a  fakelib/libgcc_s.a
+@MSVC_FALSE@fakelib_libgcc_a_SOURCES = src/libgcc/dll_dependency.S src/libgcc/dll_math.c
+@MSVC_FALSE@fakelib_libgcc_s_a_SOURCES = 
+@MSVC_FALSE@fakelib_libgcc_eh_a_SOURCES = 
+lib_LIBRARIES = $(am__append_5) $(am__append_6)
 @COPY_STATIC_TRUE@libpthread_a_SOURCES = 
 @COPY_STATIC_TRUE@libpthread_a_DEPENDENCIES = libwinpthread.la
 #FIXME: Use cp kludge until a better method presents itself
diff --git a/mingw-w64-libraries/winpthreads/configure b/mingw-w64-libraries/winpthreads/configure
index 22b955c..96df3f4 100755
--- a/mingw-w64-libraries/winpthreads/configure
+++ b/mingw-w64-libraries/winpthreads/configure
@@ -664,7 +664,6 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-RCFLAGS
 COPY_STATIC_FALSE
 COPY_STATIC_TRUE
 COPY_SHARED_FALSE
@@ -678,6 +677,7 @@
 NMEDIT
 DSYMUTIL
 MANIFEST_TOOL
+RANLIB
 FILECMD
 LN_S
 NM
@@ -692,6 +692,9 @@
 OBJDUMP
 DLLTOOL
 AS
+MSVC_FALSE
+MSVC_TRUE
+RCFLAGS
 ac_ct_AR
 AR
 am__fastdepCCAS_FALSE
@@ -699,7 +702,6 @@
 CCASDEPMODE
 CCASFLAGS
 CCAS
-RANLIB
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@@ -4641,108 +4643,6 @@
 fi
 
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_RANLIB+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_RANLIB+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
 # By default we simply use the C compiler to build assembly code.
 
 test "${CCAS+set}" = set || CCAS=$CC
@@ -5063,6 +4963,23 @@
 esac
 
 
+case $CC in #(
+  *cl|*cl.exe) :
+    RC="$am_aux_dir/windres-rc rc.exe"
+     msvc=true ;; #(
+  *) :
+    msvc=false] ;;
+esac
+
+ if test x$msvc = xtrue; then
+  MSVC_TRUE=
+  MSVC_FALSE='#'
+else
+  MSVC_TRUE='#'
+  MSVC_FALSE=
+fi
+
+
 # Libtool 2.4 should check them correctly
 # AC_CHECK_TOOLS([AR],[ar],[:])
 
@@ -13832,8 +13749,6 @@
 # mingw-w64 should already have them
 #AC_CHECK_FUNCS([ftime gettimeofday memset])
 
-
-
 ac_config_files="$ac_config_files Makefile tests/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -13977,6 +13892,10 @@
   as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${MSVC_TRUE}" && test -z "${MSVC_FALSE}"; then
+  as_fn_error $? "conditional \"MSVC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${COPY_SHARED_TRUE}" && test -z "${COPY_SHARED_FALSE}"; then
   as_fn_error $? "conditional \"COPY_SHARED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5