diff --git a/configure b/configure
index 75b39aa55c..e694f0985a 100755
--- a/configure
+++ b/configure
@@ -36153,8 +36153,8 @@ if test "$wxUSE_TOOLTIPS" = "yes"; then
 $as_echo "$as_me: WARNING: wxTooltip not supported yet under Motif... disabled" >&2;}
     else
         if test "$wxUSE_UNIVERSAL" = "yes"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet in $TOOLKIT... disabled" >&5
-$as_echo "$as_me: WARNING: wxTooltip not supported yet in $TOOLKIT... disabled" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&5
+$as_echo "$as_me: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&2;}
         else
             $as_echo "#define wxUSE_TOOLTIPS 1" >>confdefs.h
 
diff --git a/configure.in b/configure.in
index ccf8691dd8..76039da63c 100644
--- a/configure.in
+++ b/configure.in
@@ -7024,7 +7024,7 @@ if test "$wxUSE_TOOLTIPS" = "yes"; then
         AC_MSG_WARN([wxTooltip not supported yet under Motif... disabled])
     else
         if test "$wxUSE_UNIVERSAL" = "yes"; then
-            AC_MSG_WARN([wxTooltip not supported yet in $TOOLKIT... disabled])
+            AC_MSG_WARN([wxTooltip not supported yet in wxUniversal... disabled])
         else
             AC_DEFINE(wxUSE_TOOLTIPS)
         fi