diff --git a/configure b/configure
index a0df1a68c3d..3378aef22f0 100755
--- a/configure
+++ b/configure
@@ -2764,15 +2764,13 @@ Some influential environment variables:
   TIFF_PE_LIBS
               Linker flags for the PE tiff, overriding the bundled version
   XML2_PE_CFLAGS
-              C compiler flags for the PE libxml2, overriding the bundled
-              version
+              C compiler flags for the PE xml2, overriding the bundled version
   XML2_PE_LIBS
-              Linker flags for the PE libxml2, overriding the bundled version
+              Linker flags for the PE xml2, overriding the bundled version
   XSLT_PE_CFLAGS
-              C compiler flags for the PE libxslt, overriding the bundled
-              version
+              C compiler flags for the PE xslt, overriding the bundled version
   XSLT_PE_LIBS
-              Linker flags for the PE libxslt, overriding the bundled version
+              Linker flags for the PE xslt, overriding the bundled version
   ZLIB_PE_CFLAGS
               C compiler flags for the PE zlib, overriding the bundled version
   ZLIB_PE_LIBS
@@ -12422,31 +12420,31 @@ if ${XML2_PE_CFLAGS:+false} :
 then :
   XML2_PE_CFLAGS="-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC"
 else $as_nop
-  enable_libxml2=no
+  enable_xml2=no
 fi
 if ${XML2_PE_LIBS:+false} :
 then :
   XML2_PE_LIBS=xml2
 else $as_nop
-  enable_libxml2=no
+  enable_xml2=no
 fi
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: libxml2 cflags: $XML2_PE_CFLAGS" >&5
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: libxml2 libs: $XML2_PE_LIBS" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: xml2 cflags: $XML2_PE_CFLAGS" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: xml2 libs: $XML2_PE_LIBS" >&5
 
 if ${XSLT_PE_CFLAGS:+false} :
 then :
   XSLT_PE_CFLAGS="-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC"
 else $as_nop
-  enable_libxslt=no
+  enable_xslt=no
 fi
 if ${XSLT_PE_LIBS:+false} :
 then :
   XSLT_PE_LIBS=xslt
 else $as_nop
-  enable_libxslt=no
+  enable_xslt=no
 fi
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: libxslt cflags: $XSLT_PE_CFLAGS" >&5
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: libxslt libs: $XSLT_PE_LIBS" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: xslt cflags: $XSLT_PE_CFLAGS" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: xslt libs: $XSLT_PE_LIBS" >&5
 
 if ${ZLIB_PE_CFLAGS:+false} :
 then :
diff --git a/configure.ac b/configure.ac
index 1e779508828..aa5396e8d06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1041,8 +1041,8 @@ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include")
 WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I\$(top_srcdir)/libs/mpg123/src/libmpg123")
 WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png")
 WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff")
-WINE_EXTLIB_FLAGS(XML2, libxml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC")
-WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC")
+WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC")
+WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC")
 WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO")
 
 dnl **** Check for pthread ****