diff --git a/Makefile.am b/Makefile.am
index 9605bad6..61ea08e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,17 @@
 
+if XRDP_FREERDP
+FREERDPDIR = freerdp
+else
+FREERDPDIR =
+endif
+
 SUBDIRS = \
   common \
   vnc \
   rdp \
   xup \
   mc \
-  freerdp \
+  $(FREERDPDIR) \
   libxrdp \
   xrdp \
   sesman \
diff --git a/configure.ac b/configure.ac
index 5861cc74..c7759631 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,10 @@ AC_ARG_ENABLE(xrdpdebug, AS_HELP_STRING([--enable-xrdpdebug],
               [Build debug (default: no)]),
               [xrdpdebug=true], [xrdpdebug=false])
 AM_CONDITIONAL(XRDP_DEBUG, [test x$xrdpdebug = xtrue])
+AC_ARG_ENABLE(freerdp, AS_HELP_STRING([--enable-freerdp],
+              [Build freerdp module (default: no)]),
+              [freerdp=true], [freerdp=false])
+AM_CONDITIONAL(XRDP_FREERDP, [test x$freerdp = xtrue])
 
 # checking for openssl
 AC_CHECK_HEADER([openssl/rc4.h], [],