diff --git a/mail/spampd/Makefile b/mail/spampd/Makefile
index b32e09bd6346..a722e979fb4e 100644
--- a/mail/spampd/Makefile
+++ b/mail/spampd/Makefile
@@ -1,29 +1,29 @@
 # Created by: chris
 
 PORTNAME=	spampd
 PORTVERSION=	2.61
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Spamassassin SMTP Proxy
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	spamc:mail/spamassassin \
 		p5-Net-Server>=0:net/p5-Net-Server
 
 NO_BUILD=	yes
 PLIST_FILES=	sbin/spampd
 USES=		perl5 shebangfix
 SHEBANG_FILES=	spampd.pl
 SUB_LIST=	PERL=${PERL}
 USE_RC_SUBR=	spampd
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mpaperno
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/spampd.pl ${STAGEDIR}${PREFIX}/sbin/spampd
 
 .include <bsd.port.mk>
diff --git a/mail/spampd/files/spampd.in b/mail/spampd/files/spampd.in
index e74206334207..b55059fdfaf0 100644
--- a/mail/spampd/files/spampd.in
+++ b/mail/spampd/files/spampd.in
@@ -1,34 +1,33 @@
 #!/bin/sh
 #
 # PROVIDE: spampd
 # REQUIRE: LOGIN
 # BEFORE: mail
 # KEYWORD: shutdown
 #
 # Add the fellowing line to /etc/rc.conf to enable spampd:
 #
 # spampd_enable (bool):		Set it to "YES" to enable spampd
 #				Default is "NO"
 # spampd_flags:			Flags to spampd
 # spampd_extra_flags:		Additional flags, so one can
 #                               keep defaults in spampd_flags, e.g.
 #                               spampd_extra_flags="--sef" to add
 #                               "X-Envelope-From" header.
 
 . /etc/rc.subr
 
 name="spampd"
 rcvar=spampd_enable
 
 : ${spampd_enable="NO"}
 : ${spampd_pidfile="/var/run/spamd/spampd.pid"}
-: ${spampd_flags="--user=spamd --group=spamd --host 127.0.0.1:10024 --relayhost=127.0.0.1:10025 --dose --tagall --auto-whitelist"}
-
+: ${spampd_flags="--user=spamd --group=spamd --homedir=/var/spool/spamd --host=127.0.0.1:10025 --relayhost=127.0.0.1:10026 --dose --tagall"}
 load_rc_config $name
 
 command="%%PREFIX%%/sbin/$name"
 command_args="--setsid --pid=${spampd_pidfile} ${spampd_extra_flags}"
 command_interpreter="%%PERL%% -T"
 pidfile="${spampd_pidfile}"
 
 run_rc_command $1