diff --git a/configure b/configure
index 9708fe49be..9bb00a7a5f 100755
--- a/configure
+++ b/configure
@@ -4100,6 +4100,7 @@ DEFAULT_wxUSE_LIBCURL=auto
 DEFAULT_wxUSE_LIBGNOMEVFS=no
 DEFAULT_wxUSE_LIBMSPACK=no
 DEFAULT_wxUSE_LIBSDL=no
+DEFAULT_wxUSE_LIBLZMA=no
 DEFAULT_wxUSE_CAIRO=no
 
 DEFAULT_wxUSE_ACCESSIBILITY=no
diff --git a/configure.in b/configure.in
index 1ce70ae710..afe9cfccd7 100644
--- a/configure.in
+++ b/configure.in
@@ -339,6 +339,7 @@ DEFAULT_wxUSE_LIBCURL=auto
 DEFAULT_wxUSE_LIBGNOMEVFS=no
 DEFAULT_wxUSE_LIBMSPACK=no
 DEFAULT_wxUSE_LIBSDL=no
+DEFAULT_wxUSE_LIBLZMA=no
 DEFAULT_wxUSE_CAIRO=no
 
 dnl features disabled by default
diff --git a/docs/doxygen/mainpages/liblzma.h b/docs/doxygen/mainpages/liblzma.h
index e3d5b5d189..85e424bdc5 100644
--- a/docs/doxygen/mainpages/liblzma.h
+++ b/docs/doxygen/mainpages/liblzma.h
@@ -36,17 +36,22 @@ https://tukaani.org/xz/ or clone its repository and perform the usual
 
 commands sequence.
 
-As wxWidgets is built using either configure or CMake under Unix-like systems,
-there is nothing special to do to let wxWidgets use liblzma, as it will be
-detected automatically -- just check the end of configure or CMake output to
-confirm that it was found. If this is not the case because the library was
-installed in some non-default location, you need to provide @c CPPFLAGS and @c
-LDFLAGS on configure command line, e.g.:
+@subsection page_build_liblzma_configure Use liblzma with configure
+
+Pass @c --with-liblzma option to configure to enable liblzma and check the end
+of configure output to confirm that it was found. If this is not the case
+because the library was installed in some non-default location, you need to
+provide @c CPPFLAGS and @c LDFLAGS on configure command line, e.g.:
 
 @code
-    $ ../configure CPPFLAGS=-I/opt/liblzma/include LDFLAGS=-L/opt/liblzma/lib
+    $ ../configure --with-liblzma CPPFLAGS=-I/opt/liblzma/include LDFLAGS=-L/opt/liblzma/lib
 @endcode
 
+@subsection page_build_liblzma_cmake Use liblzma with CMake
+
+When using CMake, add @c -DwxUSE_LIBLZMA=ON to CMake command line to enable
+using liblzma.
+
 
 @section page_build_liblzma_msw MSW not using configure