diff --git a/src/freedombone-app-bdsmail b/src/freedombone-app-bdsmail
index 73975fbb..3499d4fc 100755
--- a/src/freedombone-app-bdsmail
+++ b/src/freedombone-app-bdsmail
@@ -326,8 +326,8 @@ function install_bdsmail {
     systemctl start bdsmail
 
     echo '#!/bin/bash' > /usr/bin/bdsmail_distribute
-    echo 'BDSMAIL_DIR=/etc/bdsmail' >> /usr/bin/bdsmail_distribute
-    echo "MAIL_DIR=\$BDSMAIL_DIR/$(cat \$BDSMAIL_DIR/config.ini | grep 'maildir =' | awk -F ' ' '{print \$3}')" >> /usr/bin/bdsmail_distribute
+    echo "BDSMAIL_DIR=$BDSMAIL_DIR" >> /usr/bin/bdsmail_distribute
+    echo "MAIL_DIR=\$BDSMAIL_DIR/\$(cat \$BDSMAIL_DIR/config.ini | grep 'maildir =' | awk -F ' ' '{print \$3}')" >> /usr/bin/bdsmail_distribute
     echo 'if [ ! -d $MAIL_DIR/postmaster/new ]; then' >> /usr/bin/bdsmail_distribute
     echo '    exit 0' >> /usr/bin/bdsmail_distribute
     echo 'fi' >> /usr/bin/bdsmail_distribute