diff --git a/configure b/configure
index 6114d3a8..f0887824 100755
--- a/configure
+++ b/configure
@@ -698,7 +698,6 @@ enable_clamd
 enable_memcached
 enable_starttls
 enable_tcpwrappers
-enable_multitenancy
 enable_tweak_sent_time
 with_database
 with_piler_user
@@ -1324,7 +1323,6 @@ Optional Features:
   --enable-memcached      build memcached support
   --enable-starttls       build starttls support
   --enable-tcpwrappers    build tcpwrappers support
-  --enable-multitenancy   build piler with multitenancy support (!!!EXPERIMENTAL!!!)
   --tweak-sent-time       tweak sent time
 
 Optional Packages:
@@ -3446,7 +3444,6 @@ have_zlib="no"
 have_starttls="no"
 have_tcpwrappers="no"
 have_tweak_sent_time="no"
-have_multitenancy="no"
 
 pdftotext="no"
 catdoc="no"
@@ -3645,13 +3642,6 @@ ac_cv_lib_wrap=ac_cv_lib_wrap_main
 fi
 
 
-# Check whether --enable-multitenancy was given.
-if test "${enable_multitenancy+set}" = set; then :
-  enableval=$enable_multitenancy; have_multitenancy=$enableval
-else
-  have_multitenancy="no"
-fi
-
 
 
 
@@ -4656,13 +4646,6 @@ if test "$have_psql" = "yes"; then
 fi
 
 
-if test "$have_multitenancy" = "yes"; then
-   echo "multitenancy support: yes"
-   defs="$defs -DHAVE_MULTITENANCY"
-   objs="$objs multitenancy.o"
-else
-   echo "multitenancy support: no"
-fi
 
 if test z`which pdftotext 2>/dev/null` != "z"; then
    pdftotext=`which pdftotext`
diff --git a/configure.in b/configure.in
index 6d5af54f..51978605 100644
--- a/configure.in
+++ b/configure.in
@@ -44,7 +44,7 @@ have_zlib="no"
 have_starttls="no"
 have_tcpwrappers="no"
 have_tweak_sent_time="no"
-have_multitenancy="no"
+dnl have_multitenancy="no"
 
 pdftotext="no"
 catdoc="no"
@@ -127,8 +127,8 @@ if test "$want_tcpwrappers" = "yes"; then
 fi
 
 
-AC_ARG_ENABLE(multitenancy,
-	[  --enable-multitenancy   build piler with multitenancy support (!!!EXPERIMENTAL!!!)], have_multitenancy=$enableval, have_multitenancy="no")
+dnl AC_ARG_ENABLE(multitenancy,
+dnl	[  --enable-multitenancy   build piler with multitenancy support (!!!EXPERIMENTAL!!!)], have_multitenancy=$enableval, have_multitenancy="no")
 
 
 
@@ -405,13 +405,13 @@ if test "$have_psql" = "yes"; then
 fi
 
 
-if test "$have_multitenancy" = "yes"; then
-   echo "multitenancy support: yes"
-   defs="$defs -DHAVE_MULTITENANCY"
-   objs="$objs multitenancy.o"
-else
-   echo "multitenancy support: no"
-fi
+dnl if test "$have_multitenancy" = "yes"; then
+dnl    echo "multitenancy support: yes"
+dnl    defs="$defs -DHAVE_MULTITENANCY"
+dnl   objs="$objs multitenancy.o"
+dnl else
+dnl    echo "multitenancy support: no"
+dnl fi
 
 if test z`which pdftotext 2>/dev/null` != "z"; then
    pdftotext=`which pdftotext`