diff --git a/src/common/autoconfig.h.in b/src/common/autoconfig.h.in
index c7005b5f..a616b7a2 100644
--- a/src/common/autoconfig.h.in
+++ b/src/common/autoconfig.h.in
@@ -47,5 +47,5 @@
 /* Split camelCase words */
 #undef RCL_SPLIT_CAMELCASE
 
-/* No X11 */
-#undef WITHOUT_X11
+/* No X11 session monitoring support */
+#undef DISABLE_X11MON
diff --git a/src/configure b/src/configure
index 7e6dea33..1e0f94f2 100755
--- a/src/configure
+++ b/src/configure
@@ -721,7 +721,8 @@ with_fam
 enable_xattr
 enable_camelcase
 enable_pic
-with_gui
+enable_qtgui
+enable_x11mon
 with_x
 '
       ac_precious_vars='build_alias
@@ -1378,6 +1379,9 @@ Optional Features:
   --enable-pic            Compile library objects as position independant
                           code. This is necessary for building the php
                           extension.
+  --disable-qtgui         Disable the QT-based graphical user interface.
+  --disable-x11mon        Disable recollindex support for X11 session
+                          monitoring.
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1392,8 +1396,6 @@ Optional Packages:
                           indexing of modified files. Give the fam/gamin
                           library as argument (ie: /usr/lib/libfam.so) if
                           configure does not find the right one.
-  --without-gui           Disable the QT user interface and auxiliary x11
-                          uses.
   --with-x                use the X Window System
 
 Some influential environment variables:
@@ -4825,20 +4827,15 @@ XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
 # If QMAKESPEC is not set and needed, the qmake test at the previous test
 # will have failed, and we tell the user to check his environment.
 #
-
-# Check whether --with-gui was given.
-if test "${with_gui+set}" = set; then
-  withval=$with_gui; withQT=$withval
+# Check whether --enable-qtgui was given.
+if test "${enable_qtgui+set}" = set; then
+  enableval=$enable_qtgui; enableQT=$enableval
 else
-  withQT="yes"
+  enableQT="yes"
 fi
 
 
-if test "$withQT" != "yes" ; then
-   cat >>confdefs.h <<\_ACEOF
-#define WITHOUT_X11 1
-_ACEOF
-
+if test "$enableQT" != "yes" ; then
    NOQTMAKE="#"
    NOCMDLINE=""
 else
@@ -5011,8 +5008,14 @@ fi
 
 
 ### X11: this is needed for the session monitoring code (in recollindex -m)
-# We disable it if without-gui has been specified, but it could be separated
-if test "$withQT" = "yes" ; then
+# Check whether --enable-x11mon was given.
+if test "${enable_x11mon+set}" = set; then
+  enableval=$enable_x11mon; enableX11mon=$enableval
+else
+  enableX11mon="yes"
+fi
+
+if test "$enableX11mon" = "yes" ; then
   ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6625,6 +6628,11 @@ fi
 
   X_LIBX11=-lX11
 else
+
+cat >>confdefs.h <<\_ACEOF
+#define DISABLE_X11MON 1
+_ACEOF
+
   X_LIBX11=""
 fi
 #echo X_CFLAGS "'$X_CFLAGS'" X_PRE_LIBS "'$X_PRE_LIBS'" X_LIBS \
diff --git a/src/configure.ac b/src/configure.ac
index 813928e4..3f6ebbc5 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -382,7 +382,7 @@ if test "$enableX11mon" = "yes" ; then
   AC_PATH_XTRA
   X_LIBX11=-lX11
 else
-  AC_DEFINE(WITHOUT_X11, 1, [No X11 session monitoring support])
+  AC_DEFINE(DISABLE_X11MON, 1, [No X11 session monitoring support])
   X_LIBX11=""
 fi
 #echo X_CFLAGS "'$X_CFLAGS'" X_PRE_LIBS "'$X_PRE_LIBS'" X_LIBS \
diff --git a/src/index/recollindex.cpp b/src/index/recollindex.cpp
index 7a91b5d0..e0601fa5 100644
--- a/src/index/recollindex.cpp
+++ b/src/index/recollindex.cpp
@@ -170,8 +170,10 @@ static const char usage [] =
 "recollindex -m [-w <secs>] -x [-D]\n"
 "    Perform real time indexation. Don't become a daemon if -D is set.\n"
 "    -w sets number of seconds to wait before starting.\n"
+#ifndef DISABLE_X11MON
 "    -x disables exit on end of x11 session\n"
-#endif
+#endif /* DISABLE_X11MON */
+#endif /* RCL_MONITOR */
 "recollindex -e <filename [filename ...]>\n"
 "    Purge data for individual files. No stem database updates\n"
 "recollindex -i <filename [filename ...]>\n"
diff --git a/src/utils/x11mon.cpp b/src/utils/x11mon.cpp
index 4a69c92e..ad1b5706 100644
--- a/src/utils/x11mon.cpp
+++ b/src/utils/x11mon.cpp
@@ -4,7 +4,7 @@ static char rcsid[] = "@(#$Id: x11mon.cpp,v 1.1 2006-12-23 12:23:15 dockes Exp $
 #endif
 // Poll state of X11 connectibility (to detect end of user session).
 #include "autoconfig.h"
-#ifndef WITHOUT_X11
+#ifndef DISABLE_X11MON
 #include <stdio.h>
 #include <X11/Xlib.h>
 #include <signal.h>
@@ -64,7 +64,7 @@ bool x11IsAlive()
 {
     return true;
 }
-#endif /* WITHOUT_X11 */
+#endif /* DISABLE_X11MON */
 
 #else