diff --git a/Makefile.am b/Makefile.am
index 02af3e8..4a4fbbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
 CFLAGS=-g -Wall
 
-SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test
+if WITH_X11VNC
+X11VNC=x11vnc
+endif
+
+SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test $(X11VNC)
 DIST_SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test
 
 bin_SCRIPTS = libvncserver-config
diff --git a/configure.ac b/configure.ac
index 7f01100..b7ff969 100644
--- a/configure.ac
+++ b/configure.ac
@@ -704,6 +704,7 @@ for directory in packages OpenLinux redhat RedHat rpm RPM "" ; do
 done
 echo "$RPMSOURCEDIR"
 AM_CONDITIONAL(HAVE_RPM, test "$RPMSOURCEDIR" != "NOT-FOUND")
+AM_CONDITIONAL(WITH_X11VNC,  test "$build_x11vnc" = "yes")
 AC_SUBST(RPMSOURCEDIR)
 
 AC_CONFIG_FILES([Makefile