Index: Makefile
===================================================================
--- Makefile	(revision 461498)
+++ Makefile	(working copy)
@@ -39,12 +39,13 @@
 
 PKGDEINSTALL=	${PKGINSTALL}
 
-OPTIONS_DEFINE=	APOP_ONLY APOP DOCUMENTATION DRAC FULL_POPD_DEBUG PAM \
+OPTIONS_DEFINE=	APOP_ONLY APOP CYRUS_SASL DOCUMENTATION DRAC FULL_POPD_DEBUG PAM \
 	POPPASSD SAMPLE_POPUSERS SHY_ENABLED \
 	OPENSSL STANDALONE_MODE U_OPTION
 
 APOP_ONLY_DESC=	build with APOP authentication only
 APOP_DESC=	build with APOP
+CYRUS_SASL_DESC=	build with cyrus-sasl
 DOCUMENTATION_DESC=	install pdf documentation
 DRAC_DESC=	build with Dynamic Relay Authorization
 FULL_POPD_DEBUG_DESC=	build with more verbose debugging
@@ -75,6 +76,10 @@
 .endif
 .endif
 
+.if {PORT_OPTIONS:CYRUS_SASL}
+CONFIGURE_ENV+= "-DCYRUS_SASL=1 ${OS_DEFS}"
+.endif
+
 # If WITH_DRAC variable present in the environment, qpopper builds
 # with Dynamic Relay Authorization Control support.
 .if ${PORT_OPTIONS:MDRAC}