diff --git a/mingw-w64-headers/configure b/mingw-w64-headers/configure
index a5260ec..10dd36f 100755
--- a/mingw-w64-headers/configure
+++ b/mingw-w64-headers/configure
@@ -624,6 +624,7 @@
 am__leading_dot
 SET_MAKE
 AWK
+mkdir_p
 MKDIR_P
 INSTALL_STRIP_PROGRAM
 STRIP
@@ -2128,6 +2129,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2439,8 +2446,8 @@
   rm -f conftest.sed
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a usable widl" >&5
-$as_echo_n "checking for a usable widl... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to rebuild headers with widl" >&5
+$as_echo_n "checking whether to rebuild headers with widl... " >&6; }
 
 # Check whether --with-widl was given.
 if test "${with_widl+set}" = set; then :
diff --git a/mingw-w64-headers/configure.ac b/mingw-w64-headers/configure.ac
index 7b60fe7..b185916 100644
--- a/mingw-w64-headers/configure.ac
+++ b/mingw-w64-headers/configure.ac
@@ -15,7 +15,7 @@
 # Checks for programs.
 AC_PROG_SED
 
-AC_MSG_CHECKING([for a usable widl])
+AC_MSG_CHECKING([whether to rebuild headers with widl])
 AC_ARG_WITH([widl],
   AS_HELP_STRING([--with-widl=PATH],
     [use widl to update idl-based headers]),