diff --git a/setup/additionals.sh b/setup/additionals.sh
index 0506f044..21ee4864 100644
--- a/setup/additionals.sh
+++ b/setup/additionals.sh
@@ -36,17 +36,22 @@ tools/editconf.py /etc/rkhunter.conf \
         UPDATE_MIRRORS=1 \
         MIRRORS_MODE=0 \
         WEB_CMD='""' \
-        MAIL-ON-WARNING=root \
         ALLOWHIDDENDIR=/etc/.java
 
+if ! grep -Fxq "SCRIPTWHITELIST=/usr/local/bin/mail" /etc/rkhunter.conf > /dev/null; then
+	echo "SCRIPTWHITELIST=/usr/local/bin/mail" >> /etc/rkhunter.conf
+fi
+
 tools/editconf.py /etc/default/rkhunter \
         CRON_DAILY_RUN='"true"' \
         CRON_DB_UPDATE='"true"' \
         APT_AUTOGEN='"true"'
 
 tools/editconf.py /etc/chkrootkit.conf \
-        RUN_DAILY='"true"'
+        RUN_DAILY='"true"' \
+        DIFF_MODE='"true"'
 
-# Should be last
+# Should be last, update expected output
 rkhunter --propupd
+chkrootkit -q > /var/log/chkrootkit/log.expected