diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index d5fd8a2b1f5d..1b56094890e8 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -29,8 +29,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-tty-tickets \
 		--with-env-editor \
 		--with-logincap \
-		--with-long-otp-prompt \
-		--with-pam
+		--with-long-otp-prompt
 
 OPTIONS_DEFINE=	LDAP INSULTS DISABLE_ROOT_SUDO DISABLE_AUTH NOARGS_SHELL \
 		AUDIT OPIE NLS
@@ -41,7 +40,7 @@ DISABLE_ROOT_SUDO_DESC=	Do not allow root to run sudo
 DISABLE_AUTH_DESC=	Do not require authentication by default
 NOARGS_SHELL_DESC=	Run a shell if no arguments are given
 AUDIT_DESC=	Enable BSM audit support
-OPIE_DESC=	Enable one-time passwords
+OPIE_DESC=	Enable one-time passwords (no PAM support)
 
 LOGFAC?=	local2
 CONFIGURE_ARGS+=	--with-logfac=${LOGFAC}
@@ -86,19 +85,21 @@ CONFIGURE_ARGS+=--disable-root-sudo
 .endif
 
 .if ${PORT_OPTIONS:MDISABLE_AUTH}
-CONFIGURE_ARGS+=--disable-authentication
+CONFIGURE_ARGS+=	--disable-authentication
 .endif
 
 .if ${PORT_OPTIONS:MNOARGS_SHELL}
-CONFIGURE_ARGS+=--enable-noargs-shell
+CONFIGURE_ARGS+=	--enable-noargs-shell
 .endif
 
 .if ${PORT_OPTIONS:MAUDIT}
-CONFIGURE_ARGS+=--with-bsm-audit
+CONFIGURE_ARGS+=	--with-bsm-audit
 .endif
 
 .if ${PORT_OPTIONS:MOPIE}
-CONFIGURE_ARGS+=--with-opie
+CONFIGURE_ARGS+=	--with-opie
+.else
+CONFIGURE_ARGS+=	--with-pam
 .endif
 
 MAN5+=		sudoers.5
diff --git a/security/sudo/pkg-descr b/security/sudo/pkg-descr
index c249b8bcb4c1..8aef9f9ae764 100644
--- a/security/sudo/pkg-descr
+++ b/security/sudo/pkg-descr
@@ -5,13 +5,4 @@ privileges to users and log root activity.  The basic philosophy is to
 give as few privileges as possible but still allow people to get their
 work done.
 
-MAILING LISTS:
-
-Please send bugs, problems, comments, etc to sudo-bugs@courtesan.com
-There is a mailing list that receives announcements whenever a new
-version of sudo is released.  You can subscribe to it by sending a
-message to "majordomo@courtesan.com" that includes the line
-"subscribe sudo-announce".  There is also a list for people working
-on sudo.  The command to add yourself is "subscribe sudo-workers".
-
 WWW: http://www.courtesan.com/sudo/