diff --git a/configure b/configure
index 6a32ba5c925..f8968bae7bd 100755
--- a/configure
+++ b/configure
@@ -5068,7 +5068,34 @@ if test "${enable_maintainer_mode+set}" = set
 then
   if test "$FONTFORGE" = "false"; then as_fn_append wine_warnings "|fontforge is missing, fonts can't be rebuilt."; fi
   if test "$RSVG" = "false"; then as_fn_append wine_warnings "|rsvg is missing, icons can't be rebuilt."; fi
-  if test "$ICOTOOL" = "false"; then as_fn_append wine_warnings "|icotool is missing, icons can't be rebuilt."; fi
+
+    if test "$ICOTOOL" = false
+  then
+    as_fn_append wine_warnings "|icotool is missing, icons can't be rebuilt."
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent enough icotool" >&5
+$as_echo_n "checking for recent enough icotool... " >&6; }
+    icotool_version=`icotool --version | head -n1`
+    if test "x$icotool_version" != "x"
+    then
+      icotool_version_major=`expr "$icotool_version" : '.* \([0-9]*\).[0-9]*'`
+      icotool_version_minor=`expr "$icotool_version" : '.* [0-9]*.\([0-9]*\)'`
+      if test "$icotool_version_major" -eq 0 -a "$icotool_version_minor" -lt 29
+      then
+        ICOTOOL=false
+        as_fn_append wine_warnings "|icotool version 0.29.0 or newer is needed to rebuild icons."
+      fi
+    fi
+    if test "$ICOTOOL" = false
+    then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no ($icotool_version_major.$icotool_version_minor)" >&5
+$as_echo "no ($icotool_version_major.$icotool_version_minor)" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($icotool_version_major.$icotool_version_minor)" >&5
+$as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; }
+    fi
+  fi
+
 fi
 
 case $host_cpu in
diff --git a/configure.ac b/configure.ac
index 2a9c3d31ce9..75008288f1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,7 +287,32 @@ if test "${enable_maintainer_mode+set}" = set
 then
   if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi
   if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi
-  if test "$ICOTOOL" = "false"; then WINE_WARNING([icotool is missing, icons can't be rebuilt.]); fi
+
+  dnl Check the icotool version
+  if test "$ICOTOOL" = false
+  then
+    WINE_WARNING([icotool is missing, icons can't be rebuilt.])
+  else
+    AC_MSG_CHECKING([for recent enough icotool])
+    icotool_version=`icotool --version | head -n1`
+    if test "x$icotool_version" != "x"
+    then
+      icotool_version_major=`expr "$icotool_version" : '.* \([[0-9]]*\).[[0-9]]*'`
+      icotool_version_minor=`expr "$icotool_version" : '.* [[0-9]]*.\([[0-9]]*\)'`
+      if test "$icotool_version_major" -eq 0 -a "$icotool_version_minor" -lt 29
+      then
+        ICOTOOL=false
+        WINE_WARNING([icotool version 0.29.0 or newer is needed to rebuild icons.])
+      fi
+    fi
+    if test "$ICOTOOL" = false
+    then
+      AC_MSG_RESULT([no ($icotool_version_major.$icotool_version_minor)])
+    else
+      AC_MSG_RESULT([yes ($icotool_version_major.$icotool_version_minor)])
+    fi
+  fi
+
 fi
 
 case $host_cpu in