diff --git a/.travis.yml b/.travis.yml
index 62583dfa..f112236f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,8 @@ script:
 after_script:
 - make clean
 env:
-- ENABLE_CLAMAV=1 ENABLE_SPAMASSASSIN=1 ENABLE_FAIL2BAN=1 SA_TAG=1.0 SA_TAG2=2.0 SA_KILL=3.0 VIRUSMAILS_DELETE_DELAY=7 ENABLE_MANAGESIEVE=1 PERMIT_DOCKER=host    DMS_DEBUG=0 SASL_PASSWD="external domain.com username:password"
-- ENABLE_CLAMAV=0 ENABLE_SPAMASSASSIN=0 ENABLE_FAIL2BAN=0 SA_TAG=    SA_TAG2=    SA_KILL=    VIRUSMAILS_DELETE_DELAY=  ENABLE_MANAGESIEVE=0 PERMIT_DOCKER=network DMS_DEBUG=1
+- ENABLE_CLAMAV=1 ENABLE_SPAMASSASSIN=1 ENABLE_FAIL2BAN=1 ONE_DIR=1 SA_TAG=1.0 SA_TAG2=2.0 SA_KILL=3.0 VIRUSMAILS_DELETE_DELAY=7 ENABLE_MANAGESIEVE=1 PERMIT_DOCKER=host    DMS_DEBUG=0 SASL_PASSWD="external domain.com username:password"
+- ENABLE_CLAMAV=0 ENABLE_SPAMASSASSIN=0 ENABLE_FAIL2BAN=0 ONE_DIR=0 SA_TAG=    SA_TAG2=    SA_KILL=    VIRUSMAILS_DELETE_DELAY=  ENABLE_MANAGESIEVE=0 PERMIT_DOCKER=network DMS_DEBUG=0
 
 notifications:
   slack:
diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index c7fc4b7b..78252c10 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -15,6 +15,7 @@ DEFAULT_VARS["ENABLE_MANAGESIEVE"]="${ENABLE_MANAGESIEVE:="0"}"
 DEFAULT_VARS["ENABLE_FETCHMAIL"]="${ENABLE_FETCHMAIL:="0"}"
 DEFAULT_VARS["ENABLE_LDAP"]="${ENABLE_LDAP:="0"}"
 DEFAULT_VARS["ENABLE_SASLAUTHD"]="${ENABLE_SASLAUTHD:="0"}"
+DEFAULT_VARS["ONE_DIR"]="${ONE_DIR:="0"}"
 DEFAULT_VARS["SMTP_ONLY"]="${SMTP_ONLY:="0"}"
 DEFAULT_VARS["VIRUSMAILS_DELETE_DELAY"]="${VIRUSMAILS_DELETE_DELAY:="7"}"
 DEFAULT_VARS["DMS_DEBUG"]="${DMS_DEBUG:="0"}"