diff --git a/README b/README
index 755a1c7d9..dcfcf733c 100644
--- a/README
+++ b/README
@@ -62,7 +62,9 @@ install' in both directories. This will install the libraries into
 /usr/local/include/matroska respectively.
 
 After you've compiled the two libraries you can now compile MkvToolNix
-itself:
+itself. If you want to use the GUI for mkvinfo then you also need
+wxWindows v2.4.0 or later (http://www.wxwindows.org/). If configure
+finds the wx-config script then support for the GUI will be enabled.
 
 bunzip2 < mkvtoolnix-...tar.bz2 | tar xvf -
 cd mkvtoolnix-...
diff --git a/README.Windows.txt b/README.Windows.txt
index 0beb77c22..83598f59e 100644
--- a/README.Windows.txt
+++ b/README.Windows.txt
@@ -46,11 +46,15 @@ cvs -d :ext:anonymous@matroska.corecodec.org:/cvsroot/matroska \
 cd libmatroska/make/linux
 make LIBEBML_INCLUDE_DIR=/usr/local/include/ebml lib install
 
-  The same applies to the releases. Of course here you have to replace
-  the 'cvs -d ...' with 'tar xvzf libebml-...', and you have to
-  include the proper version number in the cd commands.
+   The same applies to the releases. Of course here you have to replace
+   the 'cvs -d ...' with 'tar xvzf libebml-...', and you have to
+   include the proper version number in the cd commands.
 
-5) Get the mkvtoolnix sources either from CVS or a release (note that
+5) Download and install wxWindows (http://www.wxwindows.org/) if you
+   want a GUI for mkvinfo. Make sure that mkvtoolnix' configure can
+   find the wx-config script.
+
+6) Get the mkvtoolnix sources either from CVS or a release (note that
    0.3.2 is the first version that can be compiled under cygwin). For
    the CVS version do the following:
 
@@ -73,4 +77,4 @@ cd mkvtoolnix-x.y.z
 make
 make install
 
-6) Be happy and drink some milk. Moooo!
+7) Be happy and drink some milk. Moooo!
diff --git a/mkvinfo.1 b/mkvinfo.1
index daec6d643..a4f2edd05 100644
--- a/mkvinfo.1
+++ b/mkvinfo.1
@@ -12,6 +12,10 @@ information about the codecs used.
 inname
 Use '\fIinname\fR' as the source.
 .TP
+\fB\-g\fR, \fB\-\-gui\fR
+Start the GUI. This option is only available if mkvinfo was compiled with
+GUI support.
+.TP
 \fB\-v\fR, \fB\-\-verbose\fR
 Be verbose and show all Matroska elements. See the section
 \'\fBVERBOSITY LEVELS\fR' for details.