diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 1412c6cde332..d23ee3c9e802 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mailman
 DISTVERSION=	2.1.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	GNU \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
diff --git a/mail/mailman/files/mailman.in b/mail/mailman/files/mailman.in
index 4a782d816f61..679a5f4710c1 100644
--- a/mail/mailman/files/mailman.in
+++ b/mail/mailman/files/mailman.in
@@ -20,15 +20,17 @@
 
 name="mailman"
 rcvar="mailman_enable"
+required_dirs="%%MAILMANDIR%%/lists/mailman"
 command_interpreter="%%PYTHON_CMD%%"
 command="%%MAILMANDIR%%/bin/mailmanctl"
-command_args="-s -q start"
+command_args="start"
 pidfile="%%MAILMANDIR%%/data/master-qrunner.pid"
 
 load_rc_config $name
 
-: ${mailman_enable="NO"}
-: ${mailman_fix_perms="YES"}
+: ${mailman_enable:="NO"}
+: ${mailman_fix_perms:="YES"}
+: ${mailman_flags:="-s -q"}
 
 start_precmd=${name}_prestart
 extra_commands="reload status"
@@ -36,7 +38,7 @@ extra_commands="reload status"
 mailman_prestart() {
 	if checkyesno mailman_fix_perms ; then 
 	    check_startmsgs && echo "Fixing ${name} permissions:"
-	    env LC_ALL=C %%MAILMANDIR%%/bin/check_perms -f $arg ${rc_debug:+-v}
+	    env LC_ALL=C %%MAILMANDIR%%/bin/check_perms -f ${rc_debug:+-v}
 	fi
 }